@pnp/cli-microsoft365 5.0.0 → 5.1.0-beta.55e5dfb

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemGetCommand extends SpoCommand_1.default {
@@ -79,7 +79,7 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
         };
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -90,7 +90,7 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
             return `Specify listId or listTitle but not both`;
         }
         if (args.options.listId &&
-            !Utils_1.default.isValidGuid(args.options.listId)) {
+            !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         if (isNaN(parseInt(args.options.id))) {

package/dist/m365/spo/commands/listitem/listitem-isrecord.js

@@ -4,9 +4,8 @@ const Auth_1 = require("../../../../Auth");
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
-const ClientSvc_1 = require("../../ClientSvc");
 const commands_1 = require("../../commands");
 class SpoListItemIsRecordCommand extends SpoCommand_1.default {
     get name() {
@@ -22,7 +21,6 @@ class SpoListItemIsRecordCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const clientSvcCommons = new ClientSvc_1.ClientSvc(logger, this.debug);
         const resource = Auth_1.Auth.getResourceFromUrl(args.options.webUrl);
         const listIdArgument = args.options.listId || '';
         const listTitleArgument = args.options.listTitle || '';
@@ -58,11 +56,11 @@ class SpoListItemIsRecordCommand extends SpoCommand_1.default {
             if (this.debug) {
                 logger.logToStderr(`Getting request digest for request`);
             }
-            return this.getRequestDigest(args.options.webUrl);
+            return utils_1.spo.getRequestDigest(args.options.webUrl);
         })
             .then((res) => {
             formDigestValue = res.FormDigestValue;
-            return clientSvcCommons.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
+            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
         })
             .then((webIdentityResp) => {
             if (this.verbose) {
@@ -129,7 +127,7 @@ class SpoListItemIsRecordCommand extends SpoCommand_1.default {
         if (id < 1) {
             return `Item ID must be a positive number`;
         }
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -140,7 +138,7 @@ class SpoListItemIsRecordCommand extends SpoCommand_1.default {
             return `Specify listId or listTitle but not both`;
         }
         if (args.options.listId &&
-            !Utils_1.default.isValidGuid(args.options.listId)) {
+            !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         return true;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemListCommand extends SpoCommand_1.default {
@@ -36,7 +36,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                 if (this.debug) {
                     logger.logToStderr(`getting request digest for query request`);
                 }
-                return this.getRequestDigest(args.options.webUrl);
+                return utils_1.spo.getRequestDigest(args.options.webUrl);
             }
             else {
                 return Promise.resolve();
@@ -139,7 +139,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         };
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -168,7 +168,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
             return `pageNumber must be numeric`;
         }
         if (args.options.id &&
-            !Utils_1.default.isValidGuid(args.options.id)) {
+            !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} in option id is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/listitem/listitem-record-declare.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
-const ClientSvc_1 = require("../../ClientSvc");
 const commands_1 = require("../../commands");
 class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
     get name() {
@@ -22,18 +21,17 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const clientSvc = new ClientSvc_1.ClientSvc(logger, this.debug);
         let formDigestValue = '';
         let webIdentity = '';
         let listId = '';
         const listRestUrl = args.options.listId
             ? `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')`
             : `${args.options.webUrl}/_api/web/lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')`;
-        this
+        utils_1.spo
             .getRequestDigest(args.options.webUrl)
             .then((contextResponse) => {
             formDigestValue = contextResponse.FormDigestValue;
-            return clientSvc.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
+            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
         })
             .then((webIdentityResp) => {
             webIdentity = webIdentityResp.objectIdentity;
@@ -107,7 +105,7 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -117,7 +115,7 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
         if (args.options.listId && args.options.listTitle) {
             return `Specify listId or listTitle but not both`;
         }
-        if (args.options.listId && !Utils_1.default.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         const id = parseInt(args.options.id);
@@ -127,7 +125,7 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
         if (id < 1) {
             return `Item ID must be a positive number`;
         }
-        if (args.options.date && !Utils_1.default.isValidISODate(args.options.date)) {
+        if (args.options.date && !utils_1.validation.isValidISODate(args.options.date)) {
             return `${args.options.date} in option date is not in ISO format (yyyy-mm-dd)`;
         }
         return true;

package/dist/m365/spo/commands/listitem/listitem-record-undeclare.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
-const ClientSvc_1 = require("../../ClientSvc");
 const commands_1 = require("../../commands");
 class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
     get name() {
@@ -20,7 +19,6 @@ class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const clientSvcCommons = new ClientSvc_1.ClientSvc(logger, this.debug);
         const listIdArgument = args.options.listId || '';
         const listTitleArgument = args.options.listTitle || '';
         const listRestUrl = (args.options.listId ?
@@ -49,11 +47,11 @@ class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
             if (this.debug) {
                 logger.logToStderr(`getting request digest for request`);
             }
-            return this.getRequestDigest(args.options.webUrl);
+            return utils_1.spo.getRequestDigest(args.options.webUrl);
         })
             .then((res) => {
             formDigestValue = res.FormDigestValue;
-            return clientSvcCommons.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
+            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
         })
             .then((objectIdentity) => {
             if (this.verbose) {
@@ -97,7 +95,7 @@ class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
         if (isNaN(id)) {
             return `${args.options.id} is not a valid list item ID`;
         }
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -108,7 +106,7 @@ class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
             return `Specify listId or listTitle but not both`;
         }
         if (args.options.listId &&
-            !Utils_1.default.isValidGuid(args.options.listId)) {
+            !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         return true;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemRemoveCommand extends SpoCommand_1.default {
@@ -101,12 +101,12 @@ class SpoListItemRemoveCommand extends SpoCommand_1.default {
         if (isNaN(id)) {
             return `${args.options.id} is not a valid list item ID`;
         }
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId &&
-            !Utils_1.default.isValidGuid(args.options.listId)) {
+            !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         if (args.options.listId && args.options.listTitle) {

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemSetCommand extends SpoCommand_1.default {
@@ -103,7 +103,7 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
                 if (this.debug) {
                     logger.logToStderr(`getting request digest for systemUpdate request`);
                 }
-                return this.getRequestDigest(args.options.webUrl);
+                return utils_1.spo.getRequestDigest(args.options.webUrl);
             }
             else {
                 return Promise.resolve(undefined);
@@ -240,7 +240,7 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
         };
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -251,7 +251,7 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
             return `Specify listId or listTitle but not both`;
         }
         if (args.options.listId &&
-            !Utils_1.default.isValidGuid(args.options.listId)) {
+            !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/mail/mail-send.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoMailSendCommand extends SpoCommand_1.default {
@@ -95,7 +96,7 @@ class SpoMailSendCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoMailSendCommand();

package/dist/m365/spo/commands/navigation/navigation-node-add.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoNavigationNodeAddCommand extends SpoCommand_1.default {
@@ -72,7 +73,7 @@ class SpoNavigationNodeAddCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/navigation/navigation-node-list.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoNavigationNodeListCommand extends SpoCommand_1.default {
@@ -53,7 +54,7 @@ class SpoNavigationNodeListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/navigation/navigation-node-remove.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoNavigationNodeRemoveCommand extends SpoCommand_1.default {
@@ -19,7 +20,7 @@ class SpoNavigationNodeRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const removeNode = () => {
-            this
+            utils_1.spo
                 .getRequestDigest(args.options.webUrl)
                 .then((res) => {
                 if (this.verbose) {
@@ -76,7 +77,7 @@ class SpoNavigationNodeRemoveCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
@@ -23,11 +24,11 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
         const cdnTypeString = args.options.cdnType || 'Private';
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
         const thumbnailSchema = typeof args.options.thumbnailUrl === 'undefined' ? `<Parameter Type="Null" />` : `<Parameter Type="String">${args.options.thumbnailUrl}</Parameter>`;
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const requestOptions = {
@@ -50,11 +51,11 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
     validate(args) {
-        const isValidThumbnailUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.thumbnailUrl);
+        const isValidThumbnailUrl = utils_1.validation.isValidSharePointUrl(args.options.thumbnailUrl);
         if (typeof args.options.thumbnailUrl !== 'undefined' && isValidThumbnailUrl !== true) {
             return isValidThumbnailUrl;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.libraryUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.libraryUrl);
     }
     options() {
         const options = [

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoOrgAssetsLibraryListCommand extends SpoCommand_1.default {
@@ -14,11 +15,11 @@ class SpoOrgAssetsLibraryListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const requestOptions = {

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

@@ -4,6 +4,7 @@ const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand_1.default {
@@ -16,11 +17,11 @@ class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
         const removeLibrary = () => {
-            this
+            utils_1.spo
                 .getSpoAdminUrl(logger, this.debug)
                 .then((_spoAdminUrl) => {
                 spoAdminUrl = _spoAdminUrl;
-                return this.getRequestDigest(spoAdminUrl);
+                return utils_1.spo.getRequestDigest(spoAdminUrl);
             })
                 .then((res) => {
                 const requestOptions = {

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoOrgNewsSiteListCommand extends SpoCommand_1.default {
@@ -14,11 +15,11 @@ class SpoOrgNewsSiteListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const requestOptions = {

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

@@ -4,7 +4,7 @@ const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoOrgNewsSiteRemoveCommand extends SpoCommand_1.default {
@@ -22,11 +22,11 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const removeOrgNewsSite = () => {
             let spoAdminUrl = '';
-            this
+            utils_1.spo
                 .getSpoAdminUrl(logger, this.debug)
                 .then((_spoAdminUrl) => {
                 spoAdminUrl = _spoAdminUrl;
-                return this.getRequestDigest(spoAdminUrl);
+                return utils_1.spo.getRequestDigest(spoAdminUrl);
             })
                 .then((res) => {
                 const requestOptions = {
@@ -34,7 +34,7 @@ class SpoOrgNewsSiteRemoveCommand 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="64" ObjectPathId="63" /><Method Name="RemoveOrgNewsSite" Id="65" ObjectPathId="63"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="63" 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="64" ObjectPathId="63" /><Method Name="RemoveOrgNewsSite" Id="65" ObjectPathId="63"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="63" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -82,7 +82,7 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+        return utils_1.validation.isValidSharePointUrl(args.options.url);
     }
 }
 module.exports = new SpoOrgNewsSiteRemoveCommand();

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoOrgNewsSiteSetCommand extends SpoCommand_1.default {
@@ -15,11 +15,11 @@ class SpoOrgNewsSiteSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const requestOptions = {
@@ -27,7 +27,7 @@ class SpoOrgNewsSiteSetCommand 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="61" ObjectPathId="60" /><Method Name="SetOrgNewsSite" Id="62" ObjectPathId="60"><Parameters><Parameter Type="String">${Utils_1.default.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">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="60" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -51,7 +51,7 @@ class SpoOrgNewsSiteSetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+        return utils_1.validation.isValidSharePointUrl(args.options.url);
     }
 }
 module.exports = new SpoOrgNewsSiteSetCommand();

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 utils_1 = require("../../../../utils");
 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.default.getServerRelativeSiteUrl(webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId`,
+                url: `${webUrl}/_api/web/getfilebyserverrelativeurl('${utils_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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -28,7 +28,7 @@ class SpoPageAddCommand extends SpoCommand_1.default {
         let requestDigest = '';
         let itemId = '';
         let pageName = args.options.name;
-        const serverRelativeSiteUrl = Utils_1.default.getServerRelativeSiteUrl(args.options.webUrl);
+        const serverRelativeSiteUrl = utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl);
         const fileNameWithoutExtension = pageName.replace('.aspx', '');
         let bannerImageUrl = '';
         let canvasContent1 = '';
@@ -36,7 +36,7 @@ class SpoPageAddCommand extends SpoCommand_1.default {
         const pageTitle = args.options.title ? args.options.title : (args.options.name.indexOf('.aspx') > -1 ? args.options.name.substr(0, args.options.name.indexOf('.aspx')) : args.options.name);
         let pageId = null;
         const pageDescription = args.options.description || "";
-        this
+        utils_1.spo
             .getRequestDigest(args.options.webUrl)
             .then((res) => {
             requestDigest = res.FormDigestValue;
@@ -307,7 +307,7 @@ class SpoPageAddCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -3,7 +3,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 utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const StandardWebPartTypes_1 = require("../../StandardWebPartTypes");
@@ -359,7 +359,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
         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.default.isValidGuid(args.options.webPartId)) {
+        if (args.options.webPartId && !utils_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)) {
@@ -392,7 +392,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
         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 SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoPageClientSideWebPartAddCommand();