@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.3a04435

package/dist/m365/spo/commands/list/list-contenttype-default-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 _SpoListContentTypeDefaultSetCommand_instances, _SpoListContentTypeDefaultSetCommand_initTelemetry, _SpoListContentTypeDefaultSetCommand_initOptions, _SpoListContentTypeDefaultSetCommand_initValidators, _SpoListContentTypeDefaultSetCommand_initTypes;
+var _SpoListContentTypeDefaultSetCommand_instances, _SpoListContentTypeDefaultSetCommand_initTelemetry, _SpoListContentTypeDefaultSetCommand_initOptions, _SpoListContentTypeDefaultSetCommand_initValidators, _SpoListContentTypeDefaultSetCommand_initTypes, _SpoListContentTypeDefaultSetCommand_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 SpoListContentTypeDefaultSetCommand extends SpoCommand_1.default {
@@ -27,6 +29,7 @@ class SpoListContentTypeDefaultSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListContentTypeDefaultSetCommand_instances, "m", _SpoListContentTypeDefaultSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeDefaultSetCommand_instances, "m", _SpoListContentTypeDefaultSetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeDefaultSetCommand_instances, "m", _SpoListContentTypeDefaultSetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoListContentTypeDefaultSetCommand_instances, "m", _SpoListContentTypeDefaultSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_CONTENTTYPE_DEFAULT_SET;
@@ -34,129 +37,137 @@ class SpoListContentTypeDefaultSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Sets the default content type for a list';
     }
-    commandAction(logger, args, cb) {
-        const baseUrl = args.options.listId ?
-            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')` :
-            `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-        if (this.verbose) {
-            logger.logToStderr('Retrieving content type order...');
-        }
-        this
-            .getContentTypeOrder(baseUrl, logger)
-            .then((contentTypeOrder) => {
-            // see if the specified content type is among the registered content types
-            // if it is, it means it's visible
-            const contentTypeIndex = contentTypeOrder.findIndex(ct => ct.StringValue.toUpperCase() === args.options.contentTypeId.toUpperCase());
-            if (contentTypeIndex > -1) {
-                if (this.debug) {
-                    logger.logToStderr(`Content type ${args.options.contentTypeId} is visible in the list`);
-                }
-                // content type is in the list and is visible in the menu
-                if (contentTypeIndex === 0) {
-                    if (this.verbose) {
-                        logger.logToStderr(`Content type ${args.options.contentTypeId} is already set as default`);
-                    }
-                    // content type is already set as default. we're done
-                    return Promise.resolve();
-                }
-                if (this.verbose) {
-                    logger.logToStderr(`Setting content type ${args.options.contentTypeId} as default...`);
-                }
-                // remove content type from the order array so that we can put it at
-                // the beginning to make it default content type          
-                contentTypeOrder.splice(contentTypeIndex, 1);
-                contentTypeOrder.unshift({
-                    StringValue: args.options.contentTypeId
-                });
-                return this.updateContentTypeOrder(baseUrl, contentTypeOrder);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let baseUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.listId) {
+                baseUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
             }
-            if (this.debug) {
-                logger.logToStderr(`Content type ${args.options.contentTypeId} is not visible in the list`);
+            else if (args.options.listTitle) {
+                baseUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                baseUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
             if (this.verbose) {
-                logger.logToStderr('Retrieving list content types...');
+                logger.logToStderr('Retrieving content type order...');
             }
-            // content type is not visible...
-            // check if content type exists in the list
-            return this
-                .getListContentTypes(baseUrl)
-                .then((contentTypes) => {
-                if (!contentTypes.find(ct => ct.toUpperCase() === args.options.contentTypeId.toUpperCase())) {
-                    return Promise.reject(`Content type ${args.options.contentTypeId} missing in the list. Add the content type to the list first and try again.`);
+            try {
+                const contentTypeOrder = yield this.getContentTypeOrder(baseUrl, logger);
+                // see if the specified content type is among the registered content types
+                // if it is, it means it's visible
+                const contentTypeIndex = contentTypeOrder.findIndex(ct => ct.StringValue.toUpperCase() === args.options.contentTypeId.toUpperCase());
+                if (contentTypeIndex > -1) {
+                    if (this.debug) {
+                        logger.logToStderr(`Content type ${args.options.contentTypeId} is visible in the list`);
+                    }
+                    // content type is in the list and is visible in the menu
+                    if (contentTypeIndex === 0) {
+                        if (this.verbose) {
+                            logger.logToStderr(`Content type ${args.options.contentTypeId} is already set as default`);
+                        }
+                    }
+                    else {
+                        if (this.verbose) {
+                            logger.logToStderr(`Setting content type ${args.options.contentTypeId} as default...`);
+                        }
+                        // remove content type from the order array so that we can put it at
+                        // the beginning to make it default content type          
+                        contentTypeOrder.splice(contentTypeIndex, 1);
+                        contentTypeOrder.unshift({
+                            StringValue: args.options.contentTypeId
+                        });
+                        yield this.updateContentTypeOrder(baseUrl, contentTypeOrder);
+                    }
                 }
-                if (this.verbose) {
-                    logger.logToStderr(`Setting content type ${args.options.contentTypeId} as default...`);
+                else {
+                    if (this.debug) {
+                        logger.logToStderr(`Content type ${args.options.contentTypeId} is not visible in the list`);
+                    }
+                    if (this.verbose) {
+                        logger.logToStderr('Retrieving list content types...');
+                    }
+                    const contentTypes = yield this.getListContentTypes(baseUrl);
+                    if (!contentTypes.find(ct => ct.toUpperCase() === args.options.contentTypeId.toUpperCase())) {
+                        throw `Content type ${args.options.contentTypeId} missing in the list. Add the content type to the list first and try again.`;
+                    }
+                    if (this.verbose) {
+                        logger.logToStderr(`Setting content type ${args.options.contentTypeId} as default...`);
+                    }
+                    contentTypeOrder.unshift({
+                        StringValue: args.options.contentTypeId
+                    });
+                    yield this.updateContentTypeOrder(baseUrl, contentTypeOrder);
                 }
-                contentTypeOrder.unshift({
-                    StringValue: args.options.contentTypeId
-                });
-                return this.updateContentTypeOrder(baseUrl, contentTypeOrder);
-            }, err => Promise.reject(err));
-        })
-            .then(res => {
-            logger.log(res);
-            cb();
-        }, err => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getContentTypeOrder(baseUrl, logger) {
-        const requestOptions = {
-            url: `${baseUrl}/RootFolder?$select=ContentTypeOrder,UniqueContentTypeOrder`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(contentTypeOrder => {
-            let uniqueContentTypeOrder = contentTypeOrder.ContentTypeOrder;
-            if (contentTypeOrder.UniqueContentTypeOrder !== null) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${baseUrl}/RootFolder?$select=ContentTypeOrder,UniqueContentTypeOrder`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            let uniqueContentTypeOrder = response.ContentTypeOrder;
+            if (response.UniqueContentTypeOrder !== null) {
                 if (this.debug) {
                     logger.logToStderr('Using unique content type order');
                 }
-                uniqueContentTypeOrder = contentTypeOrder.UniqueContentTypeOrder;
+                uniqueContentTypeOrder = response.UniqueContentTypeOrder;
             }
             else {
                 if (this.debug) {
                     logger.logToStderr('Unique content type order not defined. Using content type order');
                 }
             }
-            return Promise.resolve(uniqueContentTypeOrder);
-        }, err => Promise.reject(err));
+            return uniqueContentTypeOrder;
+        });
     }
     updateContentTypeOrder(baseUrl, contentTypeOrder) {
-        const requestOptions = {
-            url: `${baseUrl}/RootFolder`,
-            headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json;odata=nometadata',
-                'x-http-method': 'MERGE'
-            },
-            data: {
-                UniqueContentTypeOrder: contentTypeOrder
-            },
-            responseType: 'json'
-        };
-        return request_1.default.post(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${baseUrl}/RootFolder`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json;odata=nometadata',
+                    'x-http-method': 'MERGE'
+                },
+                data: {
+                    UniqueContentTypeOrder: contentTypeOrder
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
     }
     getListContentTypes(baseUrl) {
-        const requestOptions = {
-            url: `${baseUrl}/ContentTypes?$select=Id`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(contentTypes => contentTypes.value.map(ct => ct.Id.StringValue), err => Promise.reject(err));
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${baseUrl}/ContentTypes?$select=Id`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            return response.value.map(ct => ct.Id.StringValue);
+        });
     }
 }
 _SpoListContentTypeDefaultSetCommand_instances = new WeakSet(), _SpoListContentTypeDefaultSetCommand_initTelemetry = function _SpoListContentTypeDefaultSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined'
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined'
         });
     });
 }, _SpoListContentTypeDefaultSetCommand_initOptions = function _SpoListContentTypeDefaultSetCommand_initOptions() {
@@ -166,30 +177,28 @@ _SpoListContentTypeDefaultSetCommand_instances = new WeakSet(), _SpoListContentT
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-c, --contentTypeId <contentTypeId>'
     });
 }, _SpoListContentTypeDefaultSetCommand_initValidators = function _SpoListContentTypeDefaultSetCommand_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;
     }));
 }, _SpoListContentTypeDefaultSetCommand_initTypes = function _SpoListContentTypeDefaultSetCommand_initTypes() {
     this.types.string.push('contentTypeId', 'c');
+}, _SpoListContentTypeDefaultSetCommand_initOptionSets = function _SpoListContentTypeDefaultSetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListContentTypeDefaultSetCommand();
 //# sourceMappingURL=list-contenttype-default-set.js.map

package/dist/m365/spo/commands/list/list-contenttype-list.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 _SpoListContentTypeListCommand_instances, _SpoListContentTypeListCommand_initTelemetry, _SpoListContentTypeListCommand_initOptions, _SpoListContentTypeListCommand_initValidators;
+var _SpoListContentTypeListCommand_instances, _SpoListContentTypeListCommand_initTelemetry, _SpoListContentTypeListCommand_initOptions, _SpoListContentTypeListCommand_initValidators, _SpoListContentTypeListCommand_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 SpoListContentTypeListCommand extends SpoCommand_1.default {
@@ -26,6 +28,7 @@ class SpoListContentTypeListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_CONTENTTYPE_LIST;
@@ -36,39 +39,47 @@ class SpoListContentTypeListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['StringId', 'Name', 'Hidden', 'ReadOnly', 'Sealed'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-            logger.logToStderr(`Retrieving content types information for list ${list} in site at ${args.options.webUrl}...`);
-        }
-        let requestUrl = '';
-        if (args.options.listId) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/ContentTypes`;
-        }
-        else {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/ContentTypes`;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                const list = (args.options.listId ? args.options.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl);
+                logger.logToStderr(`Retrieving content types information for list ${list} in site at ${args.options.webUrl}...`);
+            }
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.listId) {
+                requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
+            const requestOptions = {
+                url: `${requestUrl}/ContentTypes`,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoListContentTypeListCommand_instances = new WeakSet(), _SpoListContentTypeListCommand_initTelemetry = function _SpoListContentTypeListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined'
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined'
         });
     });
 }, _SpoListContentTypeListCommand_initOptions = function _SpoListContentTypeListCommand_initOptions() {
@@ -78,26 +89,24 @@ _SpoListContentTypeListCommand_instances = new WeakSet(), _SpoListContentTypeLis
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     });
 }, _SpoListContentTypeListCommand_initValidators = function _SpoListContentTypeListCommand_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;
     }));
+}, _SpoListContentTypeListCommand_initOptionSets = function _SpoListContentTypeListCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListContentTypeListCommand();
 //# sourceMappingURL=list-contenttype-list.js.map

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

@@ -13,11 +13,13 @@ 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 _SpoListContentTypeRemoveCommand_instances, _SpoListContentTypeRemoveCommand_initTelemetry, _SpoListContentTypeRemoveCommand_initOptions, _SpoListContentTypeRemoveCommand_initValidators, _SpoListContentTypeRemoveCommand_initTypes;
+var _SpoListContentTypeRemoveCommand_instances, _SpoListContentTypeRemoveCommand_initTelemetry, _SpoListContentTypeRemoveCommand_initOptions, _SpoListContentTypeRemoveCommand_initValidators, _SpoListContentTypeRemoveCommand_initTypes, _SpoListContentTypeRemoveCommand_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 urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListContentTypeRemoveCommand extends SpoCommand_1.default {
@@ -28,6 +30,7 @@ class SpoListContentTypeRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListContentTypeRemoveCommand_instances, "m", _SpoListContentTypeRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeRemoveCommand_instances, "m", _SpoListContentTypeRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeRemoveCommand_instances, "m", _SpoListContentTypeRemoveCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoListContentTypeRemoveCommand_instances, "m", _SpoListContentTypeRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_CONTENTTYPE_REMOVE;
@@ -35,53 +38,55 @@ class SpoListContentTypeRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes content type from list';
     }
-    commandAction(logger, args, cb) {
-        const removeContentTypeFromList = () => {
-            if (this.verbose) {
-                const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-                logger.logToStderr(`Removing content type ${args.options.id} from list ${list} in site at ${args.options.webUrl}...`);
-            }
-            let requestUrl = '';
-            if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/ContentTypes('${encodeURIComponent(args.options.id)}')`;
-            }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/ContentTypes('${encodeURIComponent(args.options.id)}')`;
-            }
-            const requestOptions = {
-                url: requestUrl,
-                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) {
-            removeContentTypeFromList();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the content type ${args.options.id} from the list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeContentTypeFromList = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    const list = (args.options.listId ? args.options.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl);
+                    logger.logToStderr(`Removing content type ${args.options.id} from list ${list} in site at ${args.options.webUrl}...`);
+                }
+                let requestUrl = `${args.options.webUrl}/_api/web/`;
+                if (args.options.listId) {
+                    requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                }
+                else if (args.options.listTitle) {
+                    requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                }
+                else if (args.options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                }
+                const requestOptions = {
+                    url: `${requestUrl}/ContentTypes('${encodeURIComponent(args.options.id)}')`,
+                    headers: {
+                        'X-HTTP-Method': 'DELETE',
+                        'If-Match': '*',
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    removeContentTypeFromList();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeContentTypeFromList();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the content type ${args.options.id} from the list ${args.options.listId ? args.options.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl} in site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield removeContentTypeFromList();
+                }
+            }
+        });
     }
 }
 _SpoListContentTypeRemoveCommand_instances = new WeakSet(), _SpoListContentTypeRemoveCommand_initTelemetry = function _SpoListContentTypeRemoveCommand_initTelemetry() {
@@ -89,6 +94,7 @@ _SpoListContentTypeRemoveCommand_instances = new WeakSet(), _SpoListContentTypeR
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -99,6 +105,8 @@ _SpoListContentTypeRemoveCommand_instances = new WeakSet(), _SpoListContentTypeR
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id <id>'
     }, {
@@ -106,25 +114,21 @@ _SpoListContentTypeRemoveCommand_instances = new WeakSet(), _SpoListContentTypeR
     });
 }, _SpoListContentTypeRemoveCommand_initValidators = function _SpoListContentTypeRemoveCommand_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;
     }));
 }, _SpoListContentTypeRemoveCommand_initTypes = function _SpoListContentTypeRemoveCommand_initTypes() {
     this.types.string.push('id', 'i');
+}, _SpoListContentTypeRemoveCommand_initOptionSets = function _SpoListContentTypeRemoveCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListContentTypeRemoveCommand();
 //# sourceMappingURL=list-contenttype-remove.js.map