@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 5.9.0-beta.005c47a

package/dist/m365/spo/commands/site/site-ensure.js

@@ -16,8 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteEnsureCommand_instances, _SpoSiteEnsureCommand_initOptions, _SpoSiteEnsureCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-const cli_1 = require("../../../../cli");
-const utils_1 = require("../../../../utils");
+const Cli_1 = require("../../../../cli/Cli");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const spoWebGetCommand = require("../web/web-get");
@@ -37,10 +37,41 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
     get description() {
         return 'Ensures that the particular site collection exists and updates its properties if necessary';
     }
-    commandAction(logger, args, cb) {
-        this
-            .getWeb(args, logger)
-            .then((getWebOutput) => {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const res = yield this.ensureSite(logger, args);
+                if (this.debug) {
+                    logger.logToStderr(res.stderr);
+                }
+                logger.log(res.stdout);
+                if (this.verbose) {
+                    logger.logToStderr(chalk.green('DONE'));
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    ensureSite(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let getWebOutput;
+            try {
+                getWebOutput = yield this.getWeb(args, logger);
+            }
+            catch (err) {
+                if (this.debug) {
+                    logger.logToStderr(err.stderr);
+                }
+                if (err.error.message !== '404 FILE NOT FOUND') {
+                    throw err;
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`No site found at ${args.options.url}`);
+                }
+                return this.createSite(args, logger);
+            }
             if (this.debug) {
                 logger.logToStderr(getWebOutput.stderr);
             }
@@ -64,12 +95,12 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                         expectedWebTemplate = args.options.webTemplate;
                         break;
                     default:
-                        return Promise.reject(`${args.options.type} is not a valid site type. Allowed types are TeamSite,CommunicationSite,ClassicSite`);
+                        throw `${args.options.type} is not a valid site type. Allowed types are TeamSite,CommunicationSite,ClassicSite`;
                 }
                 if (expectedWebTemplate) {
                     const currentWebTemplate = `${web.WebTemplate}#${web.Configuration}`;
                     if (expectedWebTemplate !== currentWebTemplate) {
-                        return Promise.reject(`Expected web template ${expectedWebTemplate} but site found at ${args.options.url} is based on ${currentWebTemplate}`);
+                        throw `Expected web template ${expectedWebTemplate} but site found at ${args.options.url} is based on ${currentWebTemplate}`;
                     }
                 }
             }
@@ -77,28 +108,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Site matches conditions. Updating...`);
             }
             return this.updateSite(args, logger);
-        }, (err) => {
-            if (this.debug) {
-                logger.logToStderr(err.stderr);
-            }
-            if (err.error.message !== '404 FILE NOT FOUND') {
-                return Promise.reject(err);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`No site found at ${args.options.url}`);
-            }
-            return this.createSite(args, logger);
-        })
-            .then((res) => {
-            if (this.debug) {
-                logger.logToStderr(res.stderr);
-            }
-            logger.log(res.stdout);
-            if (this.verbose) {
-                logger.logToStderr(chalk.green('DONE'));
-            }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getWeb(args, logger) {
         if (this.verbose) {
@@ -110,7 +120,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(spoWebGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return Cli_1.Cli.executeCommandWithOutput(spoWebGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
     }
     createSite(args, logger) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -141,11 +151,11 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                 verbose: this.verbose,
                 debug: this.debug
             };
-            const validationResult = yield spoSiteAddCommand.validate({ options: options }, cli_1.Cli.getCommandInfo(spoSiteAddCommand));
+            const validationResult = yield spoSiteAddCommand.validate({ options: options }, Cli_1.Cli.getCommandInfo(spoSiteAddCommand));
             if (validationResult !== true) {
                 return Promise.reject(validationResult);
             }
-            return cli_1.Cli.executeCommandWithOutput(spoSiteAddCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            return Cli_1.Cli.executeCommandWithOutput(spoSiteAddCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
         });
     }
     updateSite(args, logger) {
@@ -166,11 +176,11 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                 verbose: this.verbose,
                 debug: this.debug
             };
-            const validationResult = yield spoSiteSetCommand.validate({ options: options }, cli_1.Cli.getCommandInfo(spoSiteSetCommand));
+            const validationResult = yield spoSiteSetCommand.validate({ options: options }, Cli_1.Cli.getCommandInfo(spoSiteSetCommand));
             if (validationResult !== true) {
                 return Promise.reject(validationResult);
             }
-            return cli_1.Cli.executeCommandWithOutput(spoSiteSetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            return Cli_1.Cli.executeCommandWithOutput(spoSiteSetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
         });
     }
     /**
@@ -237,7 +247,7 @@ _SpoSiteEnsureCommand_instances = new WeakSet(), _SpoSiteEnsureCommand_initOptio
         option: '--wait'
     });
 }, _SpoSiteEnsureCommand_initValidators = function _SpoSiteEnsureCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoSiteEnsureCommand();
 //# sourceMappingURL=site-ensure.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteGetCommand_instances, _SpoSiteGetCommand_initOptions, _SpoSiteGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteGetCommand extends SpoCommand_1.default {
@@ -32,26 +32,29 @@ class SpoSiteGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets information about the specific site collection';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${args.options.url}/_api/site`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${args.options.url}/_api/site`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteGetCommand_instances = new WeakSet(), _SpoSiteGetCommand_initOptions = function _SpoSiteGetCommand_initOptions() {
     this.options.unshift({ option: '-u, --url <url>' });
 }, _SpoSiteGetCommand_initValidators = function _SpoSiteGetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoSiteGetCommand();
 //# sourceMappingURL=site-get.js.map

package/dist/m365/spo/commands/site/site-groupify.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteGroupifyCommand_instances, _SpoSiteGroupifyCommand_initTelemetry, _SpoSiteGroupifyCommand_initOptions, _SpoSiteGroupifyCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteGroupifyCommand extends SpoCommand_1.default {
@@ -33,39 +33,42 @@ class SpoSiteGroupifyCommand extends SpoCommand_1.default {
     get description() {
         return 'Connects site collection to an Microsoft 365 Group';
     }
-    commandAction(logger, args, cb) {
-        const optionalParams = {};
-        const payload = {
-            displayName: args.options.displayName,
-            alias: args.options.alias,
-            isPublic: args.options.isPublic === true,
-            optionalParams: optionalParams
-        };
-        if (args.options.description) {
-            optionalParams.Description = args.options.description;
-        }
-        if (args.options.classification) {
-            optionalParams.Classification = args.options.classification;
-        }
-        if (args.options.keepOldHomepage) {
-            optionalParams.CreationOptions = ["SharePointKeepOldHomepage"];
-        }
-        const requestOptions = {
-            url: `${args.options.siteUrl}/_api/GroupSiteManager/CreateGroupForSite`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                accept: 'application/json;odata=nometadata',
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const optionalParams = {};
+            const payload = {
+                displayName: args.options.displayName,
+                alias: args.options.alias,
+                isPublic: args.options.isPublic === true,
+                optionalParams: optionalParams
+            };
+            if (args.options.description) {
+                optionalParams.Description = args.options.description;
+            }
+            if (args.options.classification) {
+                optionalParams.Classification = args.options.classification;
+            }
+            if (args.options.keepOldHomepage) {
+                optionalParams.CreationOptions = ["SharePointKeepOldHomepage"];
+            }
+            const requestOptions = {
+                url: `${args.options.siteUrl}/_api/GroupSiteManager/CreateGroupForSite`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    accept: 'application/json;odata=nometadata',
+                    responseType: 'json'
+                },
+                data: payload,
                 responseType: 'json'
-            },
-            data: payload,
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteGroupifyCommand_instances = new WeakSet(), _SpoSiteGroupifyCommand_initTelemetry = function _SpoSiteGroupifyCommand_initTelemetry() {
@@ -94,7 +97,7 @@ _SpoSiteGroupifyCommand_instances = new WeakSet(), _SpoSiteGroupifyCommand_initT
         option: '--keepOldHomepage'
     });
 }, _SpoSiteGroupifyCommand_initValidators = function _SpoSiteGroupifyCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoSiteGroupifyCommand();
 //# sourceMappingURL=site-groupify.js.map

package/dist/m365/spo/commands/site/site-inplacerecordsmanagement-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteInPlaceRecordsManagementSetCommand_instances, _SpoSiteInPlaceRecordsManagementSetCommand_initTelemetry, _SpoSiteInPlaceRecordsManagementSetCommand_initOptions, _SpoSiteInPlaceRecordsManagementSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteInPlaceRecordsManagementSetCommand extends SpoCommand_1.default {
@@ -33,25 +33,30 @@ class SpoSiteInPlaceRecordsManagementSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Activates or deactivates in-place records management for a site collection';
     }
-    commandAction(logger, args, cb) {
-        const enabled = args.options.enabled.toLocaleLowerCase() === 'true';
-        const requestOptions = {
-            url: `${args.options.siteUrl}/_api/site/features/${enabled ? 'add' : 'remove'}`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            data: {
-                featureId: 'da2e115b-07e4-49d9-bb2c-35e93bb9fca9',
-                force: true
-            },
-            responseType: 'json'
-        };
-        if (this.verbose) {
-            logger.logToStderr(`${enabled ? 'Activating' : 'Deactivating'} in-place records management for site ${args.options.siteUrl}`);
-        }
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const enabled = args.options.enabled.toLocaleLowerCase() === 'true';
+            const requestOptions = {
+                url: `${args.options.siteUrl}/_api/site/features/${enabled ? 'add' : 'remove'}`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                data: {
+                    featureId: 'da2e115b-07e4-49d9-bb2c-35e93bb9fca9',
+                    force: true
+                },
+                responseType: 'json'
+            };
+            if (this.verbose) {
+                logger.logToStderr(`${enabled ? 'Activating' : 'Deactivating'} in-place records management for site ${args.options.siteUrl}`);
+            }
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteInPlaceRecordsManagementSetCommand_instances = new WeakSet(), _SpoSiteInPlaceRecordsManagementSetCommand_initTelemetry = function _SpoSiteInPlaceRecordsManagementSetCommand_initTelemetry() {
@@ -68,10 +73,10 @@ _SpoSiteInPlaceRecordsManagementSetCommand_instances = new WeakSet(), _SpoSiteIn
     });
 }, _SpoSiteInPlaceRecordsManagementSetCommand_initValidators = function _SpoSiteInPlaceRecordsManagementSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidBoolean(args.options.enabled)) {
+        if (!validation_1.validation.isValidBoolean(args.options.enabled)) {
             return 'Invalid "enabled" option value. Specify "true" or "false"';
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 };
 module.exports = new SpoSiteInPlaceRecordsManagementSetCommand();

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

@@ -17,7 +17,8 @@ var _SpoSiteListCommand_instances, _SpoSiteListCommand_initTelemetry, _SpoSiteLi
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteListCommand extends SpoCommand_1.default {
@@ -37,29 +38,28 @@ class SpoSiteListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Title', 'Url'];
     }
-    commandAction(logger, args, cb) {
-        const webTemplate = this.getWebTemplateId(args.options);
-        const includeOneDriveSites = args.options.includeOneDriveSites || false;
-        const personalSite = includeOneDriveSites === false ? '0' : '1';
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving list of site collections...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const webTemplate = this.getWebTemplateId(args.options);
+            const includeOneDriveSites = args.options.includeOneDriveSites || false;
+            const personalSite = includeOneDriveSites === false ? '0' : '1';
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving list of site collections...`);
+                }
+                this.allSites = [];
+                yield this.getAllSites(spoAdminUrl, formatting_1.formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, args.options.deleted, logger);
+                logger.log(this.allSites);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            this.allSites = [];
-            return this.getAllSites(spoAdminUrl, utils_1.formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, args.options.deleted, logger);
-        })
-            .then(_ => {
-            logger.log(this.allSites);
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, deleted, logger) {
         return new Promise((resolve, reject) => {
-            utils_1.spo
+            spo_1.spo
                 .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
                 .then((res) => {
                 let requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="Filter" Type="String">${filter}</Property><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">${personalSite}</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">${webTemplate}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`;

package/dist/m365/spo/commands/site/site-recyclebinitem-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteRecycleBinItemListCommand_instances, _SpoSiteRecycleBinItemListCommand_initTelemetry, _SpoSiteRecycleBinItemListCommand_initOptions, _SpoSiteRecycleBinItemListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteRecycleBinItemListCommand extends SpoCommand_1.default {
@@ -36,31 +36,34 @@ class SpoSiteRecycleBinItemListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'Title', 'DirName'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving all items from recycle bin at ${args.options.siteUrl}...`);
-        }
-        const state = args.options.secondary ? '2' : '1';
-        let requestUrl = `${args.options.siteUrl}/_api/site/RecycleBin?$filter=(ItemState eq ${state})`;
-        if (typeof args.options.type !== 'undefined') {
-            const type = SpoSiteRecycleBinItemListCommand.recycleBinItemType.find(item => item.value === args.options.type);
-            if (typeof type !== 'undefined') {
-                requestUrl += ` and (ItemType eq ${type.id})`;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving all items from recycle bin at ${args.options.siteUrl}...`);
             }
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((response) => {
-            logger.log(response.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            const state = args.options.secondary ? '2' : '1';
+            let requestUrl = `${args.options.siteUrl}/_api/site/RecycleBin?$filter=(ItemState eq ${state})`;
+            if (typeof args.options.type !== 'undefined') {
+                const type = SpoSiteRecycleBinItemListCommand.recycleBinItemType.find(item => item.value === args.options.type);
+                if (typeof type !== 'undefined') {
+                    requestUrl += ` and (ItemType eq ${type.id})`;
+                }
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const response = yield request_1.default.get(requestOptions);
+                logger.log(response.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteRecycleBinItemListCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemListCommand_initTelemetry = function _SpoSiteRecycleBinItemListCommand_initTelemetry() {
@@ -81,7 +84,7 @@ _SpoSiteRecycleBinItemListCommand_instances = new WeakSet(), _SpoSiteRecycleBinI
     });
 }, _SpoSiteRecycleBinItemListCommand_initValidators = function _SpoSiteRecycleBinItemListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/site/site-recyclebinitem-restore.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteRecycleBinItemRestoreCommand_instances, _SpoSiteRecycleBinItemRestoreCommand_initOptions, _SpoSiteRecycleBinItemRestoreCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteRecycleBinItemRestoreCommand extends SpoCommand_1.default {
@@ -32,30 +33,37 @@ class SpoSiteRecycleBinItemRestoreCommand extends SpoCommand_1.default {
     get description() {
         return 'Restores given items from the site recycle bin';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Restoring items from recycle bin at ${args.options.siteUrl}...`);
-        }
-        const requestUrl = `${args.options.siteUrl}/_api/site/RecycleBin/RestoreByIds`;
-        const ids = utils_1.formatting.splitAndTrim(args.options.ids);
-        const idsChunks = [];
-        while (ids.length) {
-            idsChunks.push(ids.splice(0, 20));
-        }
-        Promise.all(idsChunks.map((idsChunk) => {
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json',
-                data: {
-                    ids: idsChunk
-                }
-            };
-            return request_1.default.post(requestOptions);
-        })).then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Restoring items from recycle bin at ${args.options.siteUrl}...`);
+            }
+            const requestUrl = `${args.options.siteUrl}/_api/site/RecycleBin/RestoreByIds`;
+            const ids = formatting_1.formatting.splitAndTrim(args.options.ids);
+            const idsChunks = [];
+            while (ids.length) {
+                idsChunks.push(ids.splice(0, 20));
+            }
+            try {
+                yield Promise.all(idsChunks.map((idsChunk) => {
+                    const requestOptions = {
+                        url: requestUrl,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json',
+                        data: {
+                            ids: idsChunk
+                        }
+                    };
+                    return request_1.default.post(requestOptions);
+                }));
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemRestoreCommand_initOptions = function _SpoSiteRecycleBinItemRestoreCommand_initOptions() {
@@ -66,13 +74,13 @@ _SpoSiteRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoSiteRecycleB
     });
 }, _SpoSiteRecycleBinItemRestoreCommand_initValidators = function _SpoSiteRecycleBinItemRestoreCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        const invalidIds = utils_1.formatting
+        const invalidIds = formatting_1.formatting
             .splitAndTrim(args.options.ids)
-            .filter(id => !utils_1.validation.isValidGuid(id));
+            .filter(id => !validation_1.validation.isValidGuid(id));
         if (invalidIds.length > 0) {
             return `The following IDs are invalid: ${invalidIds.join(', ')}`;
         }