@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.38e141b

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

@@ -13,10 +13,11 @@ 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 _SpoListGetCommand_instances, _SpoListGetCommand_initTelemetry, _SpoListGetCommand_initOptions, _SpoListGetCommand_initValidators;
+var _SpoListGetCommand_instances, _SpoListGetCommand_initTelemetry, _SpoListGetCommand_initOptions, _SpoListGetCommand_initValidators, _SpoListGetCommand_initOptionSets;
 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");
 const ListPrincipalType_1 = require("./ListPrincipalType");
@@ -27,6 +28,7 @@ class SpoListGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_GET;
@@ -34,37 +36,40 @@ class SpoListGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets information about the specific list';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information for list in site at ${args.options.webUrl}...`);
-        }
-        let requestUrl = '';
-        if (args.options.id) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
-        }
-        else {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.title)}')`;
-        }
-        let propertiesSelect = args.options.properties ? `?$select=${encodeURIComponent(args.options.properties)}` : ``;
-        propertiesSelect += args.options.withPermissions ? `${args.options.properties ? '&' : '?'}$expand=HasUniqueRoleAssignments,RoleAssignments/Member,RoleAssignments/RoleDefinitionBindings` : ``;
-        const requestOptions = {
-            url: requestUrl + propertiesSelect,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((listInstance) => {
-            if (args.options.withPermissions) {
-                listInstance.RoleAssignments.forEach(r => {
-                    r.Member.PrincipalTypeString = ListPrincipalType_1.ListPrincipalType[r.Member.PrincipalType];
-                });
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information for list in site at ${args.options.webUrl}...`);
+            }
+            let requestUrl = '';
+            if (args.options.id) {
+                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+            }
+            else {
+                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
             }
-            logger.log(listInstance);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            let propertiesSelect = args.options.properties ? `?$select=${encodeURIComponent(args.options.properties)}` : ``;
+            propertiesSelect += args.options.withPermissions ? `${args.options.properties ? '&' : '?'}$expand=HasUniqueRoleAssignments,RoleAssignments/Member,RoleAssignments/RoleDefinitionBindings` : ``;
+            const requestOptions = {
+                url: requestUrl + propertiesSelect,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const listInstance = yield request_1.default.get(requestOptions);
+                if (args.options.withPermissions) {
+                    listInstance.RoleAssignments.forEach(r => {
+                        r.Member.PrincipalTypeString = ListPrincipalType_1.ListPrincipalType[r.Member.PrincipalType];
+                    });
+                }
+                logger.log(listInstance);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry = function _SpoListGetCommand_initTelemetry() {
@@ -90,23 +95,19 @@ _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry =
     });
 }, _SpoListGetCommand_initValidators = function _SpoListGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.id) {
-            if (!utils_1.validation.isValidGuid(args.options.id)) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (args.options.id && args.options.title) {
-            return 'Specify id or title, but not both';
-        }
-        if (!args.options.id && !args.options.title) {
-            return 'Specify id or title, one is required';
-        }
         return true;
     }));
+}, _SpoListGetCommand_initOptionSets = function _SpoListGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title']);
 };
 module.exports = new SpoListGetCommand();
 //# sourceMappingURL=list-get.js.map

package/dist/m365/spo/commands/list/list-label-get.js

@@ -13,10 +13,12 @@ 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 _SpoListLabelGetCommand_instances, _SpoListLabelGetCommand_initTelemetry, _SpoListLabelGetCommand_initOptions, _SpoListLabelGetCommand_initValidators;
+var _SpoListLabelGetCommand_instances, _SpoListLabelGetCommand_initTelemetry, _SpoListLabelGetCommand_initOptions, _SpoListLabelGetCommand_initValidators, _SpoListLabelGetCommand_initOptionSets;
 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 SpoListLabelGetCommand extends SpoCommand_1.default {
@@ -26,6 +28,7 @@ class SpoListLabelGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListLabelGetCommand_instances, "m", _SpoListLabelGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListLabelGetCommand_instances, "m", _SpoListLabelGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListLabelGetCommand_instances, "m", _SpoListLabelGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListLabelGetCommand_instances, "m", _SpoListLabelGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_LABEL_GET;
@@ -33,56 +36,54 @@ class SpoListLabelGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets label set on the specified list';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-            logger.logToStderr(`Getting label set on the list ${list} in site at ${args.options.webUrl}...`);
-        }
-        let requestUrl = '';
-        if (args.options.listId) {
-            if (this.debug) {
-                logger.logToStderr(`Retrieving List Url from Id '${args.options.listId}'...`);
-            }
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')?$expand=RootFolder&$select=RootFolder`;
-        }
-        else {
-            if (this.debug) {
-                logger.logToStderr(`Retrieving List Url from Title '${args.options.listTitle}'...`);
-            }
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$expand=RootFolder&$select=RootFolder`;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((listInstance) => {
-            const listAbsoluteUrl = utils_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listInstance.RootFolder.ServerRelativeUrl);
-            const requestUrl = `${args.options.webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_GetListComplianceTag`;
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: {
-                    listUrl: listAbsoluteUrl
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    const list = (args.options.listId ? args.options.listId : args.options.listTitle);
+                    logger.logToStderr(`Getting label set on the list ${list} in site at ${args.options.webUrl}...`);
+                }
+                let requestUrl = '';
+                if (args.options.listId) {
+                    if (this.debug) {
+                        logger.logToStderr(`Retrieving List Url from Id '${args.options.listId}'...`);
+                    }
+                    requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')?$expand=RootFolder&$select=RootFolder`;
+                }
+                else {
+                    if (this.debug) {
+                        logger.logToStderr(`Retrieving List Url from Title '${args.options.listTitle}'...`);
+                    }
+                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$expand=RootFolder&$select=RootFolder`;
+                }
+                let requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const listInstance = yield request_1.default.get(requestOptions);
+                const listAbsoluteUrl = urlUtil_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listInstance.RootFolder.ServerRelativeUrl);
+                requestOptions = {
+                    url: `${args.options.webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_GetListComplianceTag`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata',
+                        'content-type': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json',
+                    data: {
+                        listUrl: listAbsoluteUrl
+                    }
+                };
+                const res = yield request_1.default.post(requestOptions);
+                if (res['odata.null'] !== true) {
+                    logger.log(res);
                 }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            if (res['odata.null'] !== true) {
-                logger.log(res);
             }
-            cb();
-        }, (err) => {
-            this.handleRejectedODataJsonPromise(err, logger, cb);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
         });
     }
 }
@@ -103,23 +104,19 @@ _SpoListLabelGetCommand_instances = new WeakSet(), _SpoListLabelGetCommand_initT
     });
 }, _SpoListLabelGetCommand_initValidators = function _SpoListLabelGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId) {
-            if (!utils_1.validation.isValidGuid(args.options.listId)) {
+            if (!validation_1.validation.isValidGuid(args.options.listId)) {
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         return true;
     }));
+}, _SpoListLabelGetCommand_initOptionSets = function _SpoListLabelGetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListLabelGetCommand();
 //# sourceMappingURL=list-label-get.js.map

package/dist/m365/spo/commands/list/list-label-set.js

@@ -13,10 +13,12 @@ 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 _SpoListLabelSetCommand_instances, _SpoListLabelSetCommand_initTelemetry, _SpoListLabelSetCommand_initOptions, _SpoListLabelSetCommand_initValidators;
+var _SpoListLabelSetCommand_instances, _SpoListLabelSetCommand_initTelemetry, _SpoListLabelSetCommand_initOptions, _SpoListLabelSetCommand_initValidators, _SpoListLabelSetCommand_initOptionSets;
 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 SpoListLabelSetCommand extends SpoCommand_1.default {
@@ -26,6 +28,7 @@ class SpoListLabelSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListLabelSetCommand_instances, "m", _SpoListLabelSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListLabelSetCommand_instances, "m", _SpoListLabelSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListLabelSetCommand_instances, "m", _SpoListLabelSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListLabelSetCommand_instances, "m", _SpoListLabelSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_LABEL_SET;
@@ -33,52 +36,54 @@ class SpoListLabelSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Sets classification label on the specified list';
     }
-    commandAction(logger, args, cb) {
-        (() => {
-            let listRestUrl = '';
-            if (args.options.listUrl) {
-                const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                return Promise.resolve(listServerRelativeUrl);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let listRestUrl = '';
+                let listServerRelativeUrl = '';
+                if (args.options.listUrl) {
+                    const listServerRelativeUrlFromPath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    listServerRelativeUrl = listServerRelativeUrlFromPath;
+                }
+                else {
+                    if (args.options.listId) {
+                        listRestUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+                    }
+                    else {
+                        listRestUrl = `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+                    }
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/${listRestUrl}?$expand=RootFolder&$select=RootFolder`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const listInstance = yield request_1.default.get(requestOptions);
+                    listServerRelativeUrl = listInstance.RootFolder.ServerRelativeUrl;
+                }
+                const listAbsoluteUrl = urlUtil_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
+                const requestUrl = `${args.options.webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetListComplianceTag`;
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        listUrl: listAbsoluteUrl,
+                        complianceTagValue: args.options.label,
+                        blockDelete: args.options.blockDelete || false,
+                        blockEdit: args.options.blockEdit || false,
+                        syncToItems: args.options.syncToItems || false
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
             }
-            else if (args.options.listId) {
-                listRestUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            else {
-                listRestUrl = `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/${listRestUrl}?$expand=RootFolder&$select=RootFolder`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default
-                .get(requestOptions)
-                .then((listInstance) => {
-                return Promise.resolve(listInstance.RootFolder.ServerRelativeUrl);
-            });
-        })()
-            .then((listServerRelativeUrl) => {
-            const listAbsoluteUrl = utils_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
-            const requestUrl = `${args.options.webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetListComplianceTag`;
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: {
-                    listUrl: listAbsoluteUrl,
-                    complianceTagValue: args.options.label,
-                    blockDelete: args.options.blockDelete || false,
-                    blockEdit: args.options.blockEdit || false,
-                    syncToItems: args.options.syncToItems || false
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoListLabelSetCommand_instances = new WeakSet(), _SpoListLabelSetCommand_initTelemetry = function _SpoListLabelSetCommand_initTelemetry() {
@@ -112,14 +117,13 @@ _SpoListLabelSetCommand_instances = new WeakSet(), _SpoListLabelSetCommand_initT
     });
 }, _SpoListLabelSetCommand_initValidators = function _SpoListLabelSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.listId && !args.options.listTitle && !args.options.listUrl) {
-            return `Specify listId or listTitle or listUrl.`;
-        }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoListLabelSetCommand_initOptionSets = function _SpoListLabelSetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListLabelSetCommand();
 //# sourceMappingURL=list-label-set.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListListCommand_instances, _SpoListListCommand_initOptions, _SpoListListCommand_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 SpoListListCommand extends SpoCommand_1.default {
@@ -35,27 +35,30 @@ class SpoListListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Title', 'Url', 'Id'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving all lists in site at ${args.options.webUrl}...`);
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/lists?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl,*`,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((listInstances) => {
-            listInstances.value.forEach(l => {
-                l.Url = l.RootFolder.ServerRelativeUrl;
-            });
-            logger.log(listInstances.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving all lists in site at ${args.options.webUrl}...`);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/lists?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl,*`,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const listInstances = yield request_1.default.get(requestOptions);
+                listInstances.value.forEach(l => {
+                    l.Url = l.RootFolder.ServerRelativeUrl;
+                });
+                logger.log(listInstances.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoListListCommand_instances = new WeakSet(), _SpoListListCommand_initOptions = function _SpoListListCommand_initOptions() {
@@ -63,7 +66,7 @@ _SpoListListCommand_instances = new WeakSet(), _SpoListListCommand_initOptions =
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoListListCommand_initValidators = function _SpoListListCommand_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 SpoListListCommand();
 //# sourceMappingURL=list-list.js.map

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

@@ -13,11 +13,12 @@ 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 _SpoListRemoveCommand_instances, _SpoListRemoveCommand_initTelemetry, _SpoListRemoveCommand_initOptions, _SpoListRemoveCommand_initValidators;
+var _SpoListRemoveCommand_instances, _SpoListRemoveCommand_initTelemetry, _SpoListRemoveCommand_initOptions, _SpoListRemoveCommand_initValidators, _SpoListRemoveCommand_initOptionSets;
 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 formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListRemoveCommand extends SpoCommand_1.default {
@@ -27,6 +28,7 @@ class SpoListRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListRemoveCommand_instances, "m", _SpoListRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListRemoveCommand_instances, "m", _SpoListRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListRemoveCommand_instances, "m", _SpoListRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListRemoveCommand_instances, "m", _SpoListRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_REMOVE;
@@ -34,53 +36,51 @@ class SpoListRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified list';
     }
-    commandAction(logger, args, cb) {
-        const removeList = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing list in site at ${args.options.webUrl}...`);
-            }
-            let requestUrl = '';
-            if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
-            }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.title)}')`;
-            }
-            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(() => {
-                // REST post call doesn't return anything
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeList();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the list ${args.options.id || args.options.title} from site ${args.options.webUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeList = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing list in site at ${args.options.webUrl}...`);
+                }
+                let requestUrl = '';
+                if (args.options.id) {
+                    requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
                 }
                 else {
-                    removeList();
+                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
+                }
+                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);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeList();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the list ${args.options.id || args.options.title} from site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield removeList();
+                }
+            }
+        });
     }
 }
 _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelemetry = function _SpoListRemoveCommand_initTelemetry() {
@@ -103,22 +103,18 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
     });
 }, _SpoListRemoveCommand_initValidators = function _SpoListRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.id &&
-            !utils_1.validation.isValidGuid(args.options.id)) {
+            !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        if (args.options.id && args.options.title) {
-            return 'Specify id or title, but not both';
-        }
-        if (!args.options.id && !args.options.title) {
-            return 'Specify id or title';
-        }
         return true;
     }));
+}, _SpoListRemoveCommand_initOptionSets = function _SpoListRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title']);
 };
 module.exports = new SpoListRemoveCommand();
 //# sourceMappingURL=list-remove.js.map