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

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

@@ -17,7 +17,9 @@ var _SpoOrgNewsSiteSetCommand_instances, _SpoOrgNewsSiteSetCommand_initOptions,
 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 SpoOrgNewsSiteSetCommand extends SpoCommand_1.default {
@@ -36,14 +38,14 @@ class SpoOrgNewsSiteSetCommand 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 reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': reqDigest.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="61" ObjectPathId="60" /><Method Name="SetOrgNewsSite" Id="62" ObjectPathId="60"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="60" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></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="61" ObjectPathId="60" /><Method Name="SetOrgNewsSite" Id="62" ObjectPathId="60"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="60" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -63,7 +65,7 @@ _SpoOrgNewsSiteSetCommand_instances = new WeakSet(), _SpoOrgNewsSiteSetCommand_i
         option: '-u, --url <url>'
     });
 }, _SpoOrgNewsSiteSetCommand_initValidators = function _SpoOrgNewsSiteSetCommand_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 SpoOrgNewsSiteSetCommand();
 //# sourceMappingURL=orgnewssite-set.js.map

package/dist/m365/spo/commands/page/Page.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Page = exports.supportedPromoteAs = exports.supportedPageLayouts = void 0;
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const clientsidepages_1 = require("./clientsidepages");
 const pageMethods_1 = require("./pageMethods");
 exports.supportedPageLayouts = ['Article', 'Home', 'SingleWebPartAppPage', 'RepostPage', 'HeaderlessSearchResults', 'Spaces', 'Topic'];
@@ -15,7 +15,7 @@ class Page {
             }
             const pageName = this.getPageNameWithExtension(name);
             const requestOptions = {
-                url: `${webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId`,
+                url: `${webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId`,
                 headers: {
                     'content-type': 'application/json;charset=utf-8',
                     accept: 'application/json;odata=nometadata'

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

@@ -17,7 +17,9 @@ var _SpoPageAddCommand_instances, _SpoPageAddCommand_initTelemetry, _SpoPageAddC
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -41,7 +43,7 @@ class SpoPageAddCommand extends SpoCommand_1.default {
             let requestDigest = '';
             let itemId = '';
             let pageName = args.options.name;
-            const serverRelativeSiteUrl = utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl);
+            const serverRelativeSiteUrl = urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl);
             const fileNameWithoutExtension = pageName.replace('.aspx', '');
             let bannerImageUrl = '';
             let canvasContent1 = '';
@@ -50,7 +52,7 @@ class SpoPageAddCommand extends SpoCommand_1.default {
             let pageId = null;
             const pageDescription = args.options.description || "";
             try {
-                const reqDigest = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 requestDigest = reqDigest.FormDigestValue;
                 if (!pageName.endsWith('.aspx')) {
                     pageName += '.aspx';
@@ -296,7 +298,7 @@ _SpoPageAddCommand_instances = new WeakSet(), _SpoPageAddCommand_initTelemetry =
     });
 }, _SpoPageAddCommand_initValidators = function _SpoPageAddCommand_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;
         }

package/dist/m365/spo/commands/page/page-clientsidewebpart-add.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 const uuid_1 = require("uuid");
 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");
 const StandardWebPartTypes_1 = require("../../StandardWebPartTypes");
@@ -368,7 +368,7 @@ _SpoPageClientSideWebPartAddCommand_instances = new WeakSet(), _SpoPageClientSid
         if (args.options.standardWebPart && args.options.webPartId) {
             return 'Specify either the standardWebPart or the webPartId option but not both';
         }
-        if (args.options.webPartId && !utils_1.validation.isValidGuid(args.options.webPartId)) {
+        if (args.options.webPartId && !validation_1.validation.isValidGuid(args.options.webPartId)) {
             return `The webPartId '${args.options.webPartId}' is not a valid GUID`;
         }
         if (args.options.standardWebPart && !StandardWebPartTypes_1.StandardWebPartUtils.isValidStandardWebPartType(args.options.standardWebPart)) {
@@ -401,7 +401,7 @@ _SpoPageClientSideWebPartAddCommand_instances = new WeakSet(), _SpoPageClientSid
         if (args.options.column && (!(0, util_1.isNumber)(args.options.column) || args.options.column < 1)) {
             return 'The value of parameter column must be 1 or higher';
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageClientSideWebPartAddCommand();

package/dist/m365/spo/commands/page/page-column-get.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageColumnGetCommand_instances, _SpoPageColumnGetCommand_initOptions, _SpoPageColumnGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -78,7 +78,7 @@ _SpoPageColumnGetCommand_instances = new WeakSet(), _SpoPageColumnGetCommand_ini
         if (isNaN(args.options.column)) {
             return `${args.options.column} is not a number`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageColumnGetCommand();

package/dist/m365/spo/commands/page/page-column-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageColumnListCommand_instances, _SpoPageColumnListCommand_initOptions, _SpoPageColumnListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -66,7 +66,7 @@ _SpoPageColumnListCommand_instances = new WeakSet(), _SpoPageColumnListCommand_i
         if (isNaN(args.options.section)) {
             return `${args.options.section} is not a number`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageColumnListCommand();

package/dist/m365/spo/commands/page/page-control-get.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageControlGetCommand_instances, _SpoPageControlGetCommand_initOptions, _SpoPageControlGetCommand_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");
 const pageMethods_1 = require("./pageMethods");
@@ -84,10 +84,10 @@ _SpoPageControlGetCommand_instances = new WeakSet(), _SpoPageControlGetCommand_i
     });
 }, _SpoPageControlGetCommand_initValidators = function _SpoPageControlGetCommand_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 utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageControlGetCommand();

package/dist/m365/spo/commands/page/page-control-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageControlListCommand_instances, _SpoPageControlListCommand_initOptions, _SpoPageControlListCommand_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");
 const pageMethods_1 = require("./pageMethods");
@@ -78,7 +78,7 @@ _SpoPageControlListCommand_instances = new WeakSet(), _SpoPageControlListCommand
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoPageControlListCommand_initValidators = function _SpoPageControlListCommand_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 SpoPageControlListCommand();
 //# sourceMappingURL=page-control-list.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageControlSetCommand_instances, _SpoPageControlSetCommand_initTelemetry, _SpoPageControlSetCommand_initOptions, _SpoPageControlSetCommand_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");
 const Page_1 = require("./Page");
@@ -161,7 +161,7 @@ _SpoPageControlSetCommand_instances = new WeakSet(), _SpoPageControlSetCommand_i
     });
 }, _SpoPageControlSetCommand_initValidators = function _SpoPageControlSetCommand_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.webPartData && args.options.webPartProperties) {
@@ -183,7 +183,7 @@ _SpoPageControlSetCommand_instances = new WeakSet(), _SpoPageControlSetCommand_i
                 return `Specified webPartData is not a valid JSON string. Input: ${args.options.webPartData}. Error: ${e}`;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageControlSetCommand();

package/dist/m365/spo/commands/page/page-copy.js

@@ -17,7 +17,7 @@ var _SpoPageCopyCommand_instances, _SpoPageCopyCommand_initTelemetry, _SpoPageCo
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 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 SpoPageCopyCommand extends SpoCommand_1.default {
@@ -130,7 +130,7 @@ _SpoPageCopyCommand_instances = new WeakSet(), _SpoPageCopyCommand_initTelemetry
         option: '--overwrite'
     });
 }, _SpoPageCopyCommand_initValidators = function _SpoPageCopyCommand_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 SpoPageCopyCommand();
 //# sourceMappingURL=page-copy.js.map

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageGetCommand_instances, _SpoPageGetCommand_initOptions, _SpoPageGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoPageGetCommand extends SpoCommand_1.default {
@@ -46,7 +47,7 @@ class SpoPageGetCommand extends SpoCommand_1.default {
             }
             try {
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId,ListItemAllFields/PageLayoutType,ListItemAllFields/CommentsDisabled`,
+                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId,ListItemAllFields/PageLayoutType,ListItemAllFields/CommentsDisabled`,
                     headers: {
                         'content-type': 'application/json;charset=utf-8',
                         accept: 'application/json;odata=nometadata'
@@ -99,7 +100,7 @@ _SpoPageGetCommand_instances = new WeakSet(), _SpoPageGetCommand_initOptions = f
         option: '--metadataOnly'
     });
 }, _SpoPageGetCommand_initValidators = function _SpoPageGetCommand_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 SpoPageGetCommand();
 //# sourceMappingURL=page-get.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageHeaderSetCommand_instances, _SpoPageHeaderSetCommand_initTelemetry, _SpoPageHeaderSetCommand_initOptions, _SpoPageHeaderSetCommand_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 SpoPageHeaderSetCommand extends SpoCommand_1.default {
@@ -394,7 +394,7 @@ _SpoPageHeaderSetCommand_instances = new WeakSet(), _SpoPageHeaderSetCommand_ini
             args.options.textAlignment !== 'Center') {
             return `${args.options.textAlignment} is not a valid textAlignment value. Allowed values Left|Center`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageHeaderSetCommand();

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageListCommand_instances, _SpoPageListCommand_initOptions, _SpoPageListCommand_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 SpoPageListCommand extends SpoCommand_1.default {
@@ -84,7 +84,7 @@ _SpoPageListCommand_instances = new WeakSet(), _SpoPageListCommand_initOptions =
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoPageListCommand_initValidators = function _SpoPageListCommand_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 SpoPageListCommand();
 //# sourceMappingURL=page-list.js.map

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageRemoveCommand_instances, _SpoPageRemoveCommand_initOptions, _SpoPageRemoveCommand_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 urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoPageRemoveCommand extends SpoCommand_1.default {
@@ -39,7 +41,7 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
             let pageName = args.options.name;
             const removePage = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const reqDigest = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                    const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                     requestDigest = reqDigest.FormDigestValue;
                     if (!pageName.endsWith('.aspx')) {
                         pageName += '.aspx';
@@ -49,7 +51,7 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
                     }
                     const requestOptions = {
                         url: `${args.options
-                            .webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
+                            .webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
                         headers: {
                             'X-RequestDigest': requestDigest,
                             'X-HTTP-Method': 'DELETE',
@@ -68,7 +70,7 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
                 yield removePage();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -90,7 +92,7 @@ _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initOptio
         option: '--confirm'
     });
 }, _SpoPageRemoveCommand_initValidators = function _SpoPageRemoveCommand_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 SpoPageRemoveCommand();
 //# sourceMappingURL=page-remove.js.map

package/dist/m365/spo/commands/page/page-section-add.js

@@ -17,7 +17,7 @@ var _SpoPageSectionAddCommand_instances, _SpoPageSectionAddCommand_initTelemetry
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 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");
 const clientsidepages_1 = require("./clientsidepages");
@@ -190,7 +190,7 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
                 return 'The value of parameter order must be 1 or higher';
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageSectionAddCommand();

package/dist/m365/spo/commands/page/page-section-get.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSectionGetCommand_instances, _SpoPageSectionGetCommand_initOptions, _SpoPageSectionGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -62,7 +62,7 @@ _SpoPageSectionGetCommand_instances = new WeakSet(), _SpoPageSectionGetCommand_i
         if (isNaN(args.options.section)) {
             return `${args.options.section} is not a number`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageSectionGetCommand();

package/dist/m365/spo/commands/page/page-section-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSectionListCommand_instances, _SpoPageSectionListCommand_initOptions, _SpoPageSectionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -66,7 +66,7 @@ _SpoPageSectionListCommand_instances = new WeakSet(), _SpoPageSectionListCommand
         option: '-n, --name <name>'
     });
 }, _SpoPageSectionListCommand_initValidators = function _SpoPageSectionListCommand_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 SpoPageSectionListCommand();
 //# sourceMappingURL=page-section-list.js.map

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

@@ -17,7 +17,9 @@ var _SpoPageSetCommand_instances, _SpoPageSetCommand_initTelemetry, _SpoPageSetC
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -52,10 +54,10 @@ class SpoPageSetCommand extends SpoCommand_1.default {
             if (!pageName.endsWith('.aspx')) {
                 pageName += '.aspx';
             }
-            const serverRelativeFileUrl = `${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}`;
+            const serverRelativeFileUrl = `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}`;
             const needsToSavePage = !!args.options.title || !!args.options.description;
             try {
-                const requestDigestResult = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                const requestDigestResult = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 const requestDigest = requestDigestResult.FormDigestValue;
                 const page = yield Page_1.Page.checkout(args.options.name, args.options.webUrl, logger, this.debug, this.verbose);
                 if (page) {
@@ -301,7 +303,7 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
     });
 }, _SpoPageSetCommand_initValidators = function _SpoPageSetCommand_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;
         }

package/dist/m365/spo/commands/page/page-template-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageTemplateListCommand_instances, _SpoPageTemplateListCommand_initOptions, _SpoPageTemplateListCommand_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 SpoPageTemplateListCommand extends SpoCommand_1.default {
@@ -69,7 +69,7 @@ _SpoPageTemplateListCommand_instances = new WeakSet(), _SpoPageTemplateListComma
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoPageTemplateListCommand_initValidators = function _SpoPageTemplateListCommand_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 SpoPageTemplateListCommand();
 //# sourceMappingURL=page-template-list.js.map

package/dist/m365/spo/commands/page/page-text-add.js

@@ -17,7 +17,9 @@ var _SpoPageTextAddCommand_instances, _SpoPageTextAddCommand_initTelemetry, _Spo
 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 urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const clientsidepages_1 = require("./clientsidepages");
@@ -47,7 +49,7 @@ class SpoPageTextAddCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving request digest...`);
             }
             try {
-                const reqDigest = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 // Keep the reference of request digest for subsequent requests
                 requestDigest = reqDigest.FormDigestValue;
                 if (this.verbose) {
@@ -90,7 +92,7 @@ class SpoPageTextAddCommand extends SpoCommand_1.default {
         }
         const requestOptions = {
             url: `${args.options
-                .webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')/ListItemAllFields`,
+                .webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')/ListItemAllFields`,
             headers: {
                 'X-RequestDigest': requestDigest,
                 'content-type': 'application/json;odata=nometadata',
@@ -136,7 +138,7 @@ _SpoPageTextAddCommand_instances = new WeakSet(), _SpoPageTextAddCommand_initTel
         if (args.options.column && (!(0, util_1.isNumber)(args.options.column) || args.options.column < 1)) {
             return 'The value of parameter column must be 1 or higher';
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageTextAddCommand();

package/dist/m365/spo/commands/propertybag/propertybag-base.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpoPropertyBagBaseCommand = void 0;
 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 SpoCommand_1 = require("../../../base/SpoCommand");
 const base_permissions_1 = require("../../base-permissions");
 class SpoPropertyBagBaseCommand extends SpoCommand_1.default {
@@ -120,7 +121,7 @@ class SpoPropertyBagBaseCommand extends SpoCommand_1.default {
             headers: {
                 'X-RequestDigest': formDigest
             },
-            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><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(name)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(value)}</Parameter></Parameters></Method><Method Name="Update" Id="207" ObjectPathId="198" /></Actions><ObjectPaths><Property Id="205" ParentId="198" Name="${objectType}" /><Identity Id="198" Name="${identityResp.objectIdentity}" /></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><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(name)}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(value)}</Parameter></Parameters></Method><Method Name="Update" Id="207" ObjectPathId="198" /></Actions><ObjectPaths><Property Id="205" ParentId="198" Name="${objectType}" /><Identity Id="198" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
         return new Promise((resolve, reject) => {
             request_1.default.post(requestOptions).then((res) => {
@@ -145,7 +146,7 @@ class SpoPropertyBagBaseCommand extends SpoCommand_1.default {
      */
     static isNoScriptSite(webUrl, formDigest, webIdentityResp, logger, debug) {
         return new Promise((resolve, reject) => {
-            utils_1.spo.getEffectiveBasePermissions(webIdentityResp.objectIdentity, webUrl, formDigest, logger, debug)
+            spo_1.spo.getEffectiveBasePermissions(webIdentityResp.objectIdentity, webUrl, formDigest, logger, debug)
                 .then((basePermissionsResp) => {
                 resolve(basePermissionsResp.has(base_permissions_1.PermissionKind.AddAndCustomizePages) === false);
             })

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPropertyBagGetCommand_instances, _SpoPropertyBagGetCommand_initTelemetry, _SpoPropertyBagGetCommand_initOptions, _SpoPropertyBagGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagGetCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
@@ -35,9 +36,9 @@ class SpoPropertyBagGetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const contextResponse = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                const contextResponse = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 this.formDigestValue = contextResponse.FormDigestValue;
-                const identityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+                const identityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
                 let propertyBagData;
                 const opts = args.options;
                 if (opts.folder) {
@@ -88,7 +89,7 @@ _SpoPropertyBagGetCommand_instances = new WeakSet(), _SpoPropertyBagGetCommand_i
         option: '-f, --folder [folder]'
     });
 }, _SpoPropertyBagGetCommand_initValidators = function _SpoPropertyBagGetCommand_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 SpoPropertyBagGetCommand();
 //# sourceMappingURL=propertybag-get.js.map

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPropertyBagListCommand_instances, _SpoPropertyBagListCommand_initTelemetry, _SpoPropertyBagListCommand_initOptions, _SpoPropertyBagListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagListCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
@@ -35,9 +36,9 @@ class SpoPropertyBagListCommand extends propertybag_base_1.SpoPropertyBagBaseCom
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const contextResponse = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                const contextResponse = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 this.formDigestValue = contextResponse.FormDigestValue;
-                const identityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+                const identityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
                 let propertyBagData;
                 const opts = args.options;
                 if (opts.folder) {
@@ -86,7 +87,7 @@ _SpoPropertyBagListCommand_instances = new WeakSet(), _SpoPropertyBagListCommand
         option: '-f, --folder [folder]'
     });
 }, _SpoPropertyBagListCommand_initValidators = function _SpoPropertyBagListCommand_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 SpoPropertyBagListCommand();
 //# sourceMappingURL=propertybag-list.js.map