@pnp/cli-microsoft365 6.0.0-beta.d4d33ed → 6.0.0-beta.d557a48

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

@@ -1,58 +1,104 @@
 "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 _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;
     }
     get description() {
         return 'Gets information about the specified folder';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving folder from site ${args.options.webUrl}...`);
-        }
-        const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
-        const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((folder) => {
-            logger.log(folder);
-            cb();
-        }, (err) => {
-            if (err.statusCode && err.statusCode === 500) {
-                cb(new Command_1.CommandError('Please check the folder URL. Folder might not exist on the specified URL'));
-                return;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving folder from site ${args.options.webUrl}...`);
             }
-            this.handleRejectedODataJsonPromise(err, logger, cb);
-        });
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-f, --folderUrl <folderUrl>'
+            let requestUrl = '';
+            if (args.options.id) {
+                requestUrl = `${args.options.webUrl}/_api/web/GetFolderById('${encodeURIComponent(args.options.id)}')`;
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+            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: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const folder = yield request_1.default.get(requestOptions);
+                logger.log(folder);
+            }
+            catch (err) {
+                if (err.statusCode && err.statusCode === 500) {
+                    throw new Command_1.CommandError('Please check the folder URL. Folder might not exist on the specified URL');
+                }
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
+_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: '-i, --id [id]'
+    });
+}, _SpoFolderGetCommand_initValidators = function _SpoFolderGetCommand_initValidators() {
+    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

@@ -1,10 +1,34 @@
 "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 _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);
+    }
     get name() {
         return commands_1.default.FOLDER_LIST;
     }
@@ -14,41 +38,59 @@ class SpoFolderListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Name', 'ServerRelativeUrl'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving folders from site ${args.options.webUrl} parent folder ${args.options.parentFolderUrl}...`);
-        }
-        const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
-        const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')/folders`;
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((resp) => {
-            logger.log(resp.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-p, --parentFolderUrl <parentFolderUrl>'
+    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} ${args.options.recursive ? '(recursive)' : ''}...`);
+            }
+            try {
+                const resp = yield this.getFolderList(args.options.webUrl, args.options.parentFolderUrl, args.options.recursive);
+                logger.log(resp);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+    getFolderList(webUrl, parentFolderUrl, recursive, folders = []) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webUrl, parentFolderUrl);
+            const requestOptions = {
+                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/folders`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            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_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 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

@@ -1,93 +1,113 @@
 "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 _SpoFolderMoveCommand_instances, _SpoFolderMoveCommand_initTelemetry, _SpoFolderMoveCommand_initOptions, _SpoFolderMoveCommand_initValidators;
 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 {
+    constructor() {
+        super();
+        _SpoFolderMoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.FOLDER_MOVE;
     }
     get description() {
         return 'Moves a folder to another location';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-        return telemetryProps;
-    }
     getExcludedOptionsWithUrls() {
         return ['targetUrl'];
     }
-    commandAction(logger, args, cb) {
-        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 allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-        const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: {
-                exportObjectUris: [sourceAbsoluteUrl],
-                destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
-                options: {
-                    "AllowSchemaMismatch": allowSchemaMismatch,
-                    "IgnoreVersionHistory": true,
-                    "IsMoveMode": true
-                }
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((jobInfo) => {
-            return new Promise((resolve, reject) => {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const webUrl = args.options.webUrl;
+            const parsedUrl = url.parse(webUrl);
+            const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
+            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+            const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
+            const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: {
+                    exportObjectUris: [sourceAbsoluteUrl],
+                    destinationUri: urlUtil_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
+                    options: {
+                        "AllowSchemaMismatch": allowSchemaMismatch,
+                        "IgnoreVersionHistory": true,
+                        "IsMoveMode": true
+                    }
+                },
+                responseType: 'json'
+            };
+            try {
+                const jobInfo = yield request_1.default.post(requestOptions);
                 this.dots = '';
                 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(() => {
-                    utils_1.spo.waitUntilCopyJobFinished({
-                        copyJobInfo,
-                        siteUrl: webUrl,
-                        pollingInterval: progressPollInterval,
-                        resolve,
-                        reject,
-                        logger,
-                        dots: this.dots,
-                        debug: this.debug,
-                        verbose: this.verbose
-                    });
-                }, progressPollInterval);
-            });
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-s, --sourceUrl <sourceUrl>'
-            },
-            {
-                option: '-t, --targetUrl <targetUrl>'
-            },
-            {
-                option: '--allowSchemaMismatch'
+                yield new Promise((resolve, reject) => {
+                    setTimeout(() => {
+                        spo_1.spo.waitUntilCopyJobFinished({
+                            copyJobInfo,
+                            siteUrl: webUrl,
+                            pollingInterval: progressPollInterval,
+                            resolve,
+                            reject,
+                            logger,
+                            dots: this.dots,
+                            debug: this.debug,
+                            verbose: this.verbose
+                        });
+                    }, progressPollInterval);
+                });
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
+_SpoFolderMoveCommand_instances = new WeakSet(), _SpoFolderMoveCommand_initTelemetry = function _SpoFolderMoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            allowSchemaMismatch: args.options.allowSchemaMismatch || false
+        });
+    });
+}, _SpoFolderMoveCommand_initOptions = function _SpoFolderMoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-s, --sourceUrl <sourceUrl>'
+    }, {
+        option: '-t, --targetUrl <targetUrl>'
+    }, {
+        option: '--allowSchemaMismatch'
+    });
+}, _SpoFolderMoveCommand_initValidators = function _SpoFolderMoveCommand_initValidators() {
+    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

@@ -1,87 +1,104 @@
 "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 _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 {
+    constructor() {
+        super();
+        _SpoFolderRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderRemoveCommand_instances, "m", _SpoFolderRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRemoveCommand_instances, "m", _SpoFolderRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRemoveCommand_instances, "m", _SpoFolderRemoveCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.FOLDER_REMOVE;
     }
     get description() {
         return 'Deletes the specified folder';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.recycle = (!(!args.options.recycle)).toString();
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        const removeFolder = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing folder in site at ${args.options.webUrl}...`);
-            }
-            const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
-            let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
-            if (args.options.recycle) {
-                requestUrl += `/recycle()`;
-            }
-            const requestOptions = {
-                url: requestUrl,
-                method: 'POST',
-                headers: {
-                    'X-HTTP-Method': 'DELETE',
-                    'If-Match': '*',
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .post(requestOptions)
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeFolder();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.folderUrl} located in site ${args.options.webUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeFolder = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing folder in site at ${args.options.webUrl}...`);
+                }
+                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()`;
                 }
-                else {
-                    removeFolder();
+                const requestOptions = {
+                    url: requestUrl,
+                    method: 'POST',
+                    headers: {
+                        'X-HTTP-Method': 'DELETE',
+                        'If-Match': '*',
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-f, --folderUrl <folderUrl>'
-            },
-            {
-                option: '--recycle'
-            },
-            {
-                option: '--confirm'
+            if (args.options.confirm) {
+                yield removeFolder();
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.url} located in site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield removeFolder();
+                }
+            }
+        });
     }
 }
+_SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initTelemetry = function _SpoFolderRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            recycle: (!(!args.options.recycle)).toString(),
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoFolderRemoveCommand_initOptions = function _SpoFolderRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-f, --url <url>'
+    }, {
+        option: '--recycle'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFolderRemoveCommand_initValidators = function _SpoFolderRemoveCommand_initValidators() {
+    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