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

package/dist/m365/spo/commands/file/file-version-restore.js

@@ -0,0 +1,119 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoFileVersionRestoreCommand_instances, _SpoFileVersionRestoreCommand_initTelemetry, _SpoFileVersionRestoreCommand_initOptions, _SpoFileVersionRestoreCommand_initValidators, _SpoFileVersionRestoreCommand_initOptionSets, _SpoFileVersionRestoreCommand_initTypes;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoFileVersionRestoreCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFileVersionRestoreCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRestoreCommand_instances, "m", _SpoFileVersionRestoreCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRestoreCommand_instances, "m", _SpoFileVersionRestoreCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRestoreCommand_instances, "m", _SpoFileVersionRestoreCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRestoreCommand_instances, "m", _SpoFileVersionRestoreCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRestoreCommand_instances, "m", _SpoFileVersionRestoreCommand_initTypes).call(this);
+    }
+    get name() {
+        return commands_1.default.FILE_VERSION_RESTORE;
+    }
+    get description() {
+        return 'Restores a specific version of a file in a SharePoint Document library';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Restores version ${args.options.label} of the file ${args.options.fileUrl || args.options.fileId} at site ${args.options.webUrl}...`);
+            }
+            try {
+                if (args.options.confirm) {
+                    yield this.restoreVersion(args);
+                }
+                else {
+                    const result = yield Cli_1.Cli.prompt({
+                        type: 'confirm',
+                        name: 'continue',
+                        default: false,
+                        message: `Are you sure you want to restore the version ${args.options.label} from file ${args.options.fileId || args.options.fileUrl}'?`
+                    });
+                    if (result.continue) {
+                        yield this.restoreVersion(args);
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    restoreVersion(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.fileUrl) {
+                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')/versions/RestoreByLabel('${args.options.label}')`;
+            }
+            else {
+                requestUrl += `GetFileById('${args.options.fileId}')/versions/RestoreByLabel('${args.options.label}')`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+}
+_SpoFileVersionRestoreCommand_instances = new WeakSet(), _SpoFileVersionRestoreCommand_initTelemetry = function _SpoFileVersionRestoreCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            fileUrl: args.options.fileUrl,
+            fileId: args.options.fileId,
+            confirm: (!!args.options.confirm).toString()
+        });
+    });
+}, _SpoFileVersionRestoreCommand_initOptions = function _SpoFileVersionRestoreCommand_initOptions() {
+    this.options.unshift({
+        option: '-w, --webUrl <webUrl>'
+    }, {
+        option: '--label <label>'
+    }, {
+        option: '-u, --fileUrl [fileUrl]'
+    }, {
+        option: '-i, --fileId [fileId]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFileVersionRestoreCommand_initValidators = function _SpoFileVersionRestoreCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.fileId && !validation_1.validation.isValidGuid(args.options.fileId)) {
+            return `${args.options.fileId} is not a valid GUID`;
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+}, _SpoFileVersionRestoreCommand_initOptionSets = function _SpoFileVersionRestoreCommand_initOptionSets() {
+    this.optionSets.push(['fileUrl', 'fileId']);
+}, _SpoFileVersionRestoreCommand_initTypes = function _SpoFileVersionRestoreCommand_initTypes() {
+    this.types.string.push('label');
+};
+module.exports = new SpoFileVersionRestoreCommand();
+//# sourceMappingURL=file-version-restore.js.map

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFolderAddCommand_instances, _SpoFolderAddCommand_initOptions, _SpoFolderAddCommand_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 SpoFolderAddCommand extends SpoCommand_1.default {
@@ -37,7 +38,7 @@ class SpoFolderAddCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Adding folder to site ${args.options.webUrl}...`);
             }
-            const parentFolderServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
+            const parentFolderServerRelativeUrl = urlUtil_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 = {
@@ -69,7 +70,7 @@ _SpoFolderAddCommand_instances = new WeakSet(), _SpoFolderAddCommand_initOptions
         option: '-n, --name <name>'
     });
 }, _SpoFolderAddCommand_initValidators = function _SpoFolderAddCommand_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 SpoFolderAddCommand();
 //# sourceMappingURL=folder-add.js.map

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

@@ -17,7 +17,9 @@ var _SpoFolderCopyCommand_instances, _SpoFolderCopyCommand_initTelemetry, _SpoFo
 Object.defineProperty(exports, "__esModule", { value: true });
 const url = require("url");
 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 SpoFolderCopyCommand extends SpoCommand_1.default {
@@ -42,9 +44,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 = utils_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
             const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-            const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
+            const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {
                 url: requestUrl,
                 headers: {
@@ -52,7 +54,7 @@ class SpoFolderCopyCommand extends SpoCommand_1.default {
                 },
                 data: {
                     exportObjectUris: [sourceAbsoluteUrl],
-                    destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
+                    destinationUri: urlUtil_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
                     options: {
                         "AllowSchemaMismatch": allowSchemaMismatch,
                         "IgnoreVersionHistory": true
@@ -67,7 +69,7 @@ class SpoFolderCopyCommand extends SpoCommand_1.default {
                 const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                 yield new Promise((resolve, reject) => {
                     setTimeout(() => {
-                        utils_1.spo.waitUntilCopyJobFinished({
+                        spo_1.spo.waitUntilCopyJobFinished({
                             copyJobInfo,
                             siteUrl: webUrl,
                             pollingInterval: progressPollInterval,
@@ -104,7 +106,7 @@ _SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelem
         option: '--allowSchemaMismatch'
     });
 }, _SpoFolderCopyCommand_initValidators = function _SpoFolderCopyCommand_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 SpoFolderCopyCommand();
 //# sourceMappingURL=folder-copy.js.map

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

@@ -13,19 +13,22 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoFolderGetCommand_instances, _SpoFolderGetCommand_initOptions, _SpoFolderGetCommand_initValidators;
+var _SpoFolderGetCommand_instances, _SpoFolderGetCommand_initTelemetry, _SpoFolderGetCommand_initOptions, _SpoFolderGetCommand_initValidators, _SpoFolderGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 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 SpoFolderGetCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoFolderGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.FOLDER_GET;
@@ -38,8 +41,14 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving folder from site ${args.options.webUrl}...`);
             }
-            const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
+            let requestUrl = '';
+            if (args.options.id) {
+                requestUrl = `${args.options.webUrl}/_api/web/GetFolderById('${encodeURIComponent(args.options.id)}')`;
+            }
+            else if (args.options.url) {
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
+            }
             const requestOptions = {
                 url: requestUrl,
                 headers: {
@@ -60,14 +69,36 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initOptions = function _SpoFolderGetCommand_initOptions() {
+_SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemetry = function _SpoFolderGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            url: typeof args.options.url !== 'undefined'
+        });
+    });
+}, _SpoFolderGetCommand_initOptions = function _SpoFolderGetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --url <url>'
+        option: '-f, --url [url]'
+    }, {
+        option: '-i, --id [id]'
     });
 }, _SpoFolderGetCommand_initValidators = function _SpoFolderGetCommand_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* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.id) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
+                return `${args.options.id} is not a valid GUID`;
+            }
+        }
+        return true;
+    }));
+}, _SpoFolderGetCommand_initOptionSets = function _SpoFolderGetCommand_initOptionSets() {
+    this.optionSets.push(['url', 'id']);
 };
 module.exports = new SpoFolderGetCommand();
 //# sourceMappingURL=folder-get.js.map

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

@@ -13,16 +13,19 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoFolderListCommand_instances, _SpoFolderListCommand_initOptions, _SpoFolderListCommand_initValidators;
+var _SpoFolderListCommand_instances, _SpoFolderListCommand_initTelemetry, _SpoFolderListCommand_initOptions, _SpoFolderListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFolderListCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoFolderListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderListCommand_instances, "m", _SpoFolderListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderListCommand_instances, "m", _SpoFolderListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderListCommand_instances, "m", _SpoFolderListCommand_initValidators).call(this);
     }
@@ -38,35 +41,56 @@ class SpoFolderListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving folders from site ${args.options.webUrl} parent folder ${args.options.parentFolderUrl}...`);
+                logger.logToStderr(`Retrieving folders from site ${args.options.webUrl} parent folder ${args.options.parentFolderUrl} ${args.options.recursive ? '(recursive)' : ''}...`);
             }
-            const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
-            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')/folders`;
+            try {
+                const resp = yield this.getFolderList(args.options.webUrl, args.options.parentFolderUrl, args.options.recursive);
+                logger.log(resp);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getFolderList(webUrl, parentFolderUrl, recursive, folders = []) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webUrl, parentFolderUrl);
             const requestOptions = {
-                url: requestUrl,
+                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/folders`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
                 responseType: 'json'
             };
-            try {
-                const resp = yield request_1.default.get(requestOptions);
-                logger.log(resp.value);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
+            const resp = yield request_1.default.get(requestOptions);
+            if (resp.value.length > 0) {
+                for (const folder of resp.value) {
+                    folders.push(folder);
+                    if (recursive) {
+                        yield this.getFolderList(webUrl, folder.ServerRelativeUrl, recursive, folders);
+                    }
+                }
             }
+            return folders;
         });
     }
 }
-_SpoFolderListCommand_instances = new WeakSet(), _SpoFolderListCommand_initOptions = function _SpoFolderListCommand_initOptions() {
+_SpoFolderListCommand_instances = new WeakSet(), _SpoFolderListCommand_initTelemetry = function _SpoFolderListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            recursive: !!args.options.recursive
+        });
+    });
+}, _SpoFolderListCommand_initOptions = function _SpoFolderListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-p, --parentFolderUrl <parentFolderUrl>'
+    }, {
+        option: '--recursive [recursive]'
     });
 }, _SpoFolderListCommand_initValidators = function _SpoFolderListCommand_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 SpoFolderListCommand();
 //# sourceMappingURL=folder-list.js.map

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

@@ -17,7 +17,9 @@ var _SpoFolderMoveCommand_instances, _SpoFolderMoveCommand_initTelemetry, _SpoFo
 Object.defineProperty(exports, "__esModule", { value: true });
 const url = require("url");
 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 SpoFolderMoveCommand extends SpoCommand_1.default {
@@ -42,9 +44,9 @@ class SpoFolderMoveCommand extends SpoCommand_1.default {
             const webUrl = args.options.webUrl;
             const parsedUrl = url.parse(webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-            const sourceAbsoluteUrl = utils_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
             const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-            const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
+            const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {
                 url: requestUrl,
                 headers: {
@@ -52,7 +54,7 @@ class SpoFolderMoveCommand extends SpoCommand_1.default {
                 },
                 data: {
                     exportObjectUris: [sourceAbsoluteUrl],
-                    destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
+                    destinationUri: urlUtil_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
                     options: {
                         "AllowSchemaMismatch": allowSchemaMismatch,
                         "IgnoreVersionHistory": true,
@@ -68,7 +70,7 @@ class SpoFolderMoveCommand extends SpoCommand_1.default {
                 const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                 yield new Promise((resolve, reject) => {
                     setTimeout(() => {
-                        utils_1.spo.waitUntilCopyJobFinished({
+                        spo_1.spo.waitUntilCopyJobFinished({
                             copyJobInfo,
                             siteUrl: webUrl,
                             pollingInterval: progressPollInterval,
@@ -105,7 +107,7 @@ _SpoFolderMoveCommand_instances = new WeakSet(), _SpoFolderMoveCommand_initTelem
         option: '--allowSchemaMismatch'
     });
 }, _SpoFolderMoveCommand_initValidators = function _SpoFolderMoveCommand_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 SpoFolderMoveCommand();
 //# sourceMappingURL=folder-move.js.map

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFolderRemoveCommand_instances, _SpoFolderRemoveCommand_initTelemetry, _SpoFolderRemoveCommand_initOptions, _SpoFolderRemoveCommand_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 urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFolderRemoveCommand extends SpoCommand_1.default {
@@ -40,7 +41,7 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
                 if (this.verbose) {
                     logger.logToStderr(`Removing folder in site at ${args.options.webUrl}...`);
                 }
-                const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
                 let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
                 if (args.options.recycle) {
                     requestUrl += `/recycle()`;
@@ -66,7 +67,7 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
                 yield removeFolder();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -97,7 +98,7 @@ _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initT
         option: '--confirm'
     });
 }, _SpoFolderRemoveCommand_initValidators = function _SpoFolderRemoveCommand_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 SpoFolderRemoveCommand();
 //# sourceMappingURL=folder-remove.js.map

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

@@ -17,7 +17,9 @@ var _SpoFolderRenameCommand_instances, _SpoFolderRenameCommand_initOptions, _Spo
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFolderRenameCommand extends SpoCommand_1.default {
@@ -36,14 +38,14 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
     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);
                 const formDigestValue = contextResponse.FormDigestValue;
-                const webIdentityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
-                const folderObjectIdentity = yield utils_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, args.options.webUrl, args.options.url, formDigestValue);
+                const webIdentityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
+                const folderObjectIdentity = yield spo_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, args.options.webUrl, args.options.url, formDigestValue);
                 if (this.verbose) {
                     logger.logToStderr(`Renaming folder ${args.options.url} to ${args.options.name}`);
                 }
-                const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
                 const serverRelativeUrlWithoutOldFolder = serverRelativeUrl.substring(0, serverRelativeUrl.lastIndexOf('/'));
                 const renamedServerRelativeUrl = `${serverRelativeUrlWithoutOldFolder}/${args.options.name}`;
                 const requestOptions = {
@@ -75,7 +77,7 @@ _SpoFolderRenameCommand_instances = new WeakSet(), _SpoFolderRenameCommand_initO
         option: '-n, --name <name>'
     });
 }, _SpoFolderRenameCommand_initValidators = function _SpoFolderRenameCommand_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 SpoFolderRenameCommand();
 //# sourceMappingURL=folder-rename.js.map