@pnp/cli-microsoft365 5.0.0 → 5.1.0-beta.04832fc

package/dist/m365/spo/commands/feature/feature-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 SpoFeatureListCommand extends SpoCommand_1.default {
@@ -58,7 +59,7 @@ class SpoFeatureListCommand extends SpoCommand_1.default {
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+        return utils_1.validation.isValidSharePointUrl(args.options.url);
     }
 }
 module.exports = new SpoFeatureListCommand();

package/dist/m365/spo/commands/field/field-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 SpoFieldAddCommand extends SpoCommand_1.default {
@@ -11,7 +12,7 @@ class SpoFieldAddCommand extends SpoCommand_1.default {
         return 'Adds a new list or site column using the CAML field definition';
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getRequestDigest(args.options.webUrl)
             .then((res) => {
             const requestOptions = {
@@ -87,7 +88,7 @@ class SpoFieldAddCommand 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/field/field-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 SpoFieldGetCommand extends SpoCommand_1.default {
@@ -29,7 +29,7 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
             listRestUrl = `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/`;
         }
         else if (args.options.listUrl) {
-            const listServerRelativeUrl = Utils_1.default.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+            const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
             listRestUrl = `GetList('${encodeURIComponent(listServerRelativeUrl)}')/`;
         }
         let fieldRestUrl = '';
@@ -78,17 +78,17 @@ class SpoFieldGetCommand 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;
         }
         if (!args.options.id && !args.options.fieldTitle) {
             return 'Specify id or fieldTitle, one is required';
         }
-        if (args.options.id && !Utils_1.default.isValidGuid(args.options.id)) {
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        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} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/field/field-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 SpoFieldRemoveCommand extends SpoCommand_1.default {
@@ -63,7 +63,7 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
                 listRestUrl = `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/`;
             }
             else if (args.options.listUrl) {
-                const listServerRelativeUrl = Utils_1.default.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 listRestUrl = `GetList('${encodeURIComponent(listServerRelativeUrl)}')/`;
             }
             if (args.options.group) {
@@ -155,17 +155,17 @@ class SpoFieldRemoveCommand 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;
         }
         if (!args.options.id && !args.options.fieldTitle && !args.options.group) {
             return 'Specify id, fieldTitle, or group. One is required';
         }
-        if (args.options.id && !Utils_1.default.isValidGuid(args.options.id)) {
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        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} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/field/field-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 SpoFieldSetCommand extends SpoCommand_1.default {
@@ -27,7 +27,7 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let requestDigest = '';
-        this
+        utils_1.spo
             .getRequestDigest(args.options.webUrl)
             .then((res) => {
             requestDigest = res.FormDigestValue;
@@ -35,8 +35,8 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
                 return Promise.resolve(undefined);
             }
             const listQuery = args.options.listId ?
-                `<Method Id="663" ParentId="7" Name="GetById"><Parameters><Parameter Type="Guid">${Utils_1.default.escapeXml(args.options.listId)}</Parameter></Parameters></Method>` :
-                `<Method Id="663" ParentId="7" Name="GetByTitle"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.listTitle)}</Parameter></Parameters></Method>`;
+                `<Method Id="663" ParentId="7" Name="GetById"><Parameters><Parameter Type="Guid">${utils_1.formatting.escapeXml(args.options.listId)}</Parameter></Parameters></Method>` :
+                `<Method Id="663" ParentId="7" Name="GetByTitle"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.listTitle)}</Parameter></Parameters></Method>`;
             const requestOptions = {
                 url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
@@ -60,8 +60,8 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
             }
             // retrieve column CSOM object id
             const fieldQuery = args.options.id ?
-                `<Method Id="663" ParentId="7" Name="GetById"><Parameters><Parameter Type="Guid">${Utils_1.default.escapeXml(args.options.id)}</Parameter></Parameters></Method>` :
-                `<Method Id="663" ParentId="7" Name="GetByInternalNameOrTitle"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.name)}</Parameter></Parameters></Method>`;
+                `<Method Id="663" ParentId="7" Name="GetById"><Parameters><Parameter Type="Guid">${utils_1.formatting.escapeXml(args.options.id)}</Parameter></Parameters></Method>` :
+                `<Method Id="663" ParentId="7" Name="GetByInternalNameOrTitle"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method>`;
             const requestOptions = {
                 url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
@@ -112,7 +112,7 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
         ];
         let i = 667;
         const payload = Object.keys(options).map(key => {
-            return excludeOptions.indexOf(key) === -1 ? `<SetProperty Id="${i++}" ObjectPathId="663" Name="${key}"><Parameter Type="String">${Utils_1.default.escapeXml(options[key])}</Parameter></SetProperty>` : '';
+            return excludeOptions.indexOf(key) === -1 ? `<SetProperty Id="${i++}" ObjectPathId="663" Name="${key}"><Parameter Type="String">${utils_1.formatting.escapeXml(options[key])}</Parameter></SetProperty>` : '';
         }).join('');
         return payload;
     }
@@ -141,7 +141,7 @@ class SpoFieldSetCommand 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;
         }
@@ -149,7 +149,7 @@ class SpoFieldSetCommand 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 (!args.options.id && !args.options.name) {
@@ -159,7 +159,7 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
             return `Specify viewId or viewTitle but not both`;
         }
         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/file/file-add.js

@@ -4,10 +4,9 @@ const fs = require("fs");
 const path = require("path");
 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 FolderExtensions_1 = require("../../FolderExtensions");
 class SpoFileAddCommand extends SpoCommand_1.default {
     constructor() {
         super(...arguments);
@@ -36,10 +35,9 @@ class SpoFileAddCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const folderPath = Utils_1.default.getServerRelativePath(args.options.webUrl, args.options.folder);
+        const folderPath = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folder);
         const fullPath = path.resolve(args.options.path);
-        const fileName = Utils_1.default.getSafeFileName(path.basename(fullPath));
-        const folderExtensions = new FolderExtensions_1.FolderExtensions(logger, this.debug);
+        const fileName = utils_1.fsUtil.getSafeFileName(path.basename(fullPath));
         let isCheckedOut = false;
         let listSettings;
         if (this.debug) {
@@ -60,7 +58,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
         };
         request_1.default.get(requestOptions).catch(() => {
             // folder does not exist so will attempt to create the folder tree
-            return folderExtensions.ensureFolder(args.options.webUrl, folderPath);
+            return utils_1.spo.ensureFolder(args.options.webUrl, folderPath, logger, this.debug);
         })
             .then(() => {
             if (args.options.checkOut) {
@@ -291,7 +289,7 @@ class SpoFileAddCommand 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/file/file-checkin.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");
 var CheckinType;
@@ -81,12 +81,12 @@ class SpoFileCheckinCommand 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;
         }
         if (args.options.id) {
-            if (!Utils_1.default.isValidGuid(args.options.id)) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }

package/dist/m365/spo/commands/file/file-checkout.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 SpoFileCheckoutCommand extends SpoCommand_1.default {
@@ -52,12 +52,12 @@ class SpoFileCheckoutCommand 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;
         }
         if (args.options.id) {
-            if (!Utils_1.default.isValidGuid(args.options.id)) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const url = require("url");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileCopyCommand extends SpoCommand_1.default {
@@ -43,9 +44,9 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
         })
             .then(() => {
             // all preconditions met, now create copy job
-            const sourceAbsoluteUrl = this.urlCombine(webUrl, args.options.sourceUrl);
+            const sourceAbsoluteUrl = utils_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
             const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-            const requestUrl = this.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
+            const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {
                 url: requestUrl,
                 headers: {
@@ -53,7 +54,7 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
                 },
                 data: {
                     exportObjectUris: [sourceAbsoluteUrl],
-                    destinationUri: this.urlCombine(tenantUrl, args.options.targetUrl),
+                    destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
                     options: {
                         "AllowSchemaMismatch": allowSchemaMismatch,
                         "IgnoreVersionHistory": true
@@ -69,7 +70,17 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
                 const copyJobInfo = jobInfo.value[0];
                 const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                 setTimeout(() => {
-                    this.waitUntilCopyJobFinished(copyJobInfo, webUrl, progressPollInterval, resolve, reject, logger, this.dots);
+                    utils_1.spo.waitUntilCopyJobFinished({
+                        copyJobInfo,
+                        siteUrl: webUrl,
+                        pollingInterval: progressPollInterval,
+                        resolve,
+                        reject,
+                        logger,
+                        dots: this.dots,
+                        debug: this.debug,
+                        verbose: this.verbose
+                    });
                 }, progressPollInterval);
             });
         })
@@ -97,11 +108,11 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
      */
     recycleFile(tenantUrl, targetUrl, filename, logger) {
         return new Promise((resolve, reject) => {
-            const targetFolderAbsoluteUrl = this.urlCombine(tenantUrl, targetUrl);
+            const targetFolderAbsoluteUrl = utils_1.urlUtil.urlCombine(tenantUrl, targetUrl);
             // since the target WebFullUrl is unknown we can use getRequestDigestForSite
             // to get it from target folder absolute url.
             // Similar approach used here Microsoft.SharePoint.Client.Web.WebUrlFromFolderUrlDirect
-            this
+            utils_1.spo
                 .getRequestDigest(targetFolderAbsoluteUrl)
                 .then((contextResponse) => {
                 if (this.debug) {
@@ -164,7 +175,7 @@ class SpoFileCopyCommand 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 SpoFileCopyCommand();

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileGetCommand extends SpoCommand_1.default {
@@ -127,12 +127,12 @@ class SpoFileGetCommand 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;
         }
         if (args.options.id) {
-            if (!Utils_1.default.isValidGuid(args.options.id)) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }

package/dist/m365/spo/commands/file/file-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 SpoFileListCommand extends SpoCommand_1.default {
@@ -24,7 +24,7 @@ class SpoFileListCommand extends SpoCommand_1.default {
     getFiles(folderUrl, args, files = { value: [] }) {
         // If --recursive option is specified, retrieve both Files and Folder details, otherwise only Files.
         const expandParameters = args.options.recursive ? 'Files,Folders' : 'Files';
-        let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${Utils_1.default.encodeQueryParameter(folderUrl)}')?$expand=${expandParameters}`;
+        let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${utils_1.formatting.encodeQueryParameter(folderUrl)}')?$expand=${expandParameters}`;
         if (args.options.output !== 'json') {
             requestUrl += '&$select=Files/UniqueId,Files/Name,Files/ServerRelativeUrl';
         }
@@ -67,7 +67,7 @@ class SpoFileListCommand 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 SpoFileListCommand();

package/dist/m365/spo/commands/file/file-move.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const url = require("url");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileMoveCommand extends SpoCommand_1.default {
@@ -43,9 +44,9 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
         })
             .then(() => {
             // all preconditions met, now create copy job
-            const sourceAbsoluteUrl = this.urlCombine(webUrl, args.options.sourceUrl);
+            const sourceAbsoluteUrl = utils_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
             const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-            const requestUrl = this.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
+            const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {
                 url: requestUrl,
                 headers: {
@@ -53,7 +54,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                 },
                 data: {
                     exportObjectUris: [sourceAbsoluteUrl],
-                    destinationUri: this.urlCombine(tenantUrl, args.options.targetUrl),
+                    destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
                     options: {
                         "AllowSchemaMismatch": allowSchemaMismatch,
                         "IgnoreVersionHistory": true,
@@ -70,7 +71,17 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                 const copyJobInfo = jobInfo.value[0];
                 const progressPollInterval = 1800; // 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                 setTimeout(() => {
-                    this.waitUntilCopyJobFinished(copyJobInfo, webUrl, progressPollInterval, resolve, reject, logger, this.dots);
+                    utils_1.spo.waitUntilCopyJobFinished({
+                        copyJobInfo,
+                        siteUrl: webUrl,
+                        pollingInterval: progressPollInterval,
+                        resolve,
+                        reject,
+                        logger,
+                        dots: this.dots,
+                        debug: this.debug,
+                        verbose: this.verbose
+                    });
                 }, progressPollInterval);
             });
         })
@@ -98,11 +109,11 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
      */
     recycleFile(tenantUrl, targetUrl, filename, logger) {
         return new Promise((resolve, reject) => {
-            const targetFolderAbsoluteUrl = this.urlCombine(tenantUrl, targetUrl);
+            const targetFolderAbsoluteUrl = utils_1.urlUtil.urlCombine(tenantUrl, targetUrl);
             // since the target WebFullUrl is unknown we can use getRequestDigest
             // to get it from target folder absolute url.
             // Similar approach used here Microsoft.SharePoint.Client.Web.WebUrlFromFolderUrlDirect
-            this.getRequestDigest(targetFolderAbsoluteUrl)
+            utils_1.spo.getRequestDigest(targetFolderAbsoluteUrl)
                 .then((contextResponse) => {
                 if (this.debug) {
                     logger.logToStderr(`contextResponse.WebFullUrl: ${contextResponse.WebFullUrl}`);
@@ -164,7 +175,7 @@ class SpoFileMoveCommand 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 SpoFileMoveCommand();

package/dist/m365/spo/commands/file/file-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 SpoFileRemoveCommand extends SpoCommand_1.default {
@@ -107,12 +107,12 @@ class SpoFileRemoveCommand 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;
         }
         if (args.options.id &&
-            !Utils_1.default.isValidGuid(args.options.id)) {
+            !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.id && args.options.url) {

package/dist/m365/spo/commands/file/file-sharinginfo-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");
 const FileSharingPrincipalType_1 = require("./FileSharingPrincipalType");
@@ -108,12 +108,12 @@ class SpoFileSharinginfoGetCommand 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;
         }
         if (args.options.id) {
-            if (!Utils_1.default.isValidGuid(args.options.id)) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }

package/dist/m365/spo/commands/folder/folder-add.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 SpoFolderAddCommand extends SpoCommand_1.default {
@@ -15,7 +15,7 @@ class SpoFolderAddCommand extends SpoCommand_1.default {
         if (this.verbose) {
             logger.logToStderr(`Adding folder to site ${args.options.webUrl}...`);
         }
-        const parentFolderServerRelativeUrl = Utils_1.default.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
+        const parentFolderServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
         const serverRelativeUrl = `${parentFolderServerRelativeUrl}/${args.options.name}`;
         const requestUrl = `${args.options.webUrl}/_api/web/folders`;
         const requestOptions = {
@@ -51,7 +51,7 @@ class SpoFolderAddCommand 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 SpoFolderAddCommand();

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const url = require("url");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFolderCopyCommand extends SpoCommand_1.default {
@@ -23,9 +24,9 @@ class SpoFolderCopyCommand extends SpoCommand_1.default {
         const webUrl = args.options.webUrl;
         const parsedUrl = url.parse(webUrl);
         const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-        const sourceAbsoluteUrl = this.urlCombine(webUrl, args.options.sourceUrl);
+        const sourceAbsoluteUrl = utils_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
         const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-        const requestUrl = this.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
+        const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
         const requestOptions = {
             url: requestUrl,
             headers: {
@@ -33,7 +34,7 @@ class SpoFolderCopyCommand extends SpoCommand_1.default {
             },
             data: {
                 exportObjectUris: [sourceAbsoluteUrl],
-                destinationUri: this.urlCombine(tenantUrl, args.options.targetUrl),
+                destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
                 options: {
                     "AllowSchemaMismatch": allowSchemaMismatch,
                     "IgnoreVersionHistory": true
@@ -49,7 +50,17 @@ class SpoFolderCopyCommand extends SpoCommand_1.default {
                 const copyJobInfo = jobInfo.value[0];
                 const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                 setTimeout(() => {
-                    this.waitUntilCopyJobFinished(copyJobInfo, webUrl, progressPollInterval, resolve, reject, logger, this.dots);
+                    utils_1.spo.waitUntilCopyJobFinished({
+                        copyJobInfo,
+                        siteUrl: webUrl,
+                        pollingInterval: progressPollInterval,
+                        resolve,
+                        reject,
+                        logger,
+                        dots: this.dots,
+                        debug: this.debug,
+                        verbose: this.verbose
+                    });
                 }, progressPollInterval);
             });
         })
@@ -74,7 +85,7 @@ class SpoFolderCopyCommand 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 SpoFolderCopyCommand();