@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7920dfd

package/dist/m365/spo/commands/contenttype/contenttype-field-set.js

@@ -15,10 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoContentTypeFieldSetCommand_instances, _SpoContentTypeFieldSetCommand_initTelemetry, _SpoContentTypeFieldSetCommand_initOptions, _SpoContentTypeFieldSetCommand_initValidators, _SpoContentTypeFieldSetCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 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 validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
@@ -40,156 +41,131 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Adds or updates a site column reference in a site content type';
     }
-    commandAction(logger, args, cb) {
-        let schemaXmlWithResourceTokens = '';
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving field link for field ${args.options.fieldId}...`);
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.fieldId}')`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res["odata.null"] !== true) {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let schemaXmlWithResourceTokens = '';
                 if (this.verbose) {
-                    logger.logToStderr('Field link found');
+                    logger.logToStderr(`Retrieving field link for field ${args.options.id}...`);
+                }
+                let requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/contenttypes('${formatting_1.formatting.encodeQueryParameter(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const fieldLink = yield request_1.default.get(requestOptions);
+                if (fieldLink["odata.null"] !== true) {
+                    if (this.verbose) {
+                        logger.logToStderr('Field link found');
+                    }
+                    this.fieldLink = fieldLink;
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('Field link not found. Creating...');
+                        logger.logToStderr(`Retrieving information about site column ${args.options.id}...`);
+                    }
+                    requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/fields('${args.options.id}')?$select=SchemaXmlWithResourceTokens`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const field = yield request_1.default.get(requestOptions);
+                    schemaXmlWithResourceTokens = field.SchemaXmlWithResourceTokens;
+                    yield this.createFieldLink(logger, args, schemaXmlWithResourceTokens);
+                }
+                if (!this.fieldLink) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Retrieving information about field link for field ${args.options.id}...`);
+                    }
+                    requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/contenttypes('${formatting_1.formatting.encodeQueryParameter(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const fieldLinkResult = yield request_1.default.get(requestOptions);
+                    if (fieldLinkResult && fieldLinkResult["odata.null"] !== true) {
+                        this.fieldLink = fieldLinkResult;
+                    }
+                }
+                if (!this.fieldLink) {
+                    throw `Couldn't find field link for field ${args.options.id}`;
+                }
+                let updateHidden = false;
+                let updateRequired = false;
+                if (typeof args.options.hidden !== 'undefined' &&
+                    this.fieldLink.Hidden !== (args.options.hidden === 'true')) {
+                    updateHidden = true;
+                }
+                if (typeof args.options.required !== 'undefined' &&
+                    this.fieldLink.Required !== (args.options.required === 'true')) {
+                    updateRequired = true;
+                }
+                if (!updateHidden && !updateRequired) {
+                    if (this.verbose) {
+                        logger.logToStderr('Field link already up-to-date');
+                    }
+                    throw 'DONE';
+                }
+                if (!this.siteId) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Retrieving site collection id...`);
+                    }
+                    requestOptions = {
+                        url: `${args.options.webUrl}/_api/site?$select=Id`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const site = yield request_1.default.get(requestOptions);
+                    this.siteId = site.Id;
+                }
+                if (!this.webId) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Retrieving site id...`);
+                    }
+                    requestOptions = {
+                        url: `${args.options.webUrl}/_api/web?$select=Id`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const web = yield request_1.default.get(requestOptions);
+                    this.webId = web.Id;
                 }
-                this.fieldLink = res;
-                return Promise.resolve(undefined);
-            }
-            if (this.verbose) {
-                logger.logToStderr('Field link not found. Creating...');
-                logger.logToStderr(`Retrieving information about site column ${args.options.fieldId}...`);
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/fields('${args.options.fieldId}')?$select=SchemaXmlWithResourceTokens`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (!res) {
-                return Promise.resolve();
-            }
-            schemaXmlWithResourceTokens = res.SchemaXmlWithResourceTokens;
-            return this.createFieldLink(logger, args, schemaXmlWithResourceTokens);
-        })
-            .then(() => {
-            if (this.fieldLink) {
-                return Promise.resolve(undefined);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving information about field link for field ${args.options.fieldId}...`);
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.fieldId}')`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (res && res["odata.null"] !== true) {
-                this.fieldLink = res;
-            }
-            if (!this.fieldLink) {
-                return Promise.reject(`Couldn't find field link for field ${args.options.fieldId}`);
-            }
-            let updateHidden = false;
-            let updateRequired = false;
-            if (typeof args.options.hidden !== 'undefined' &&
-                this.fieldLink.Hidden !== (args.options.hidden === 'true')) {
-                updateHidden = true;
-            }
-            if (typeof args.options.required !== 'undefined' &&
-                this.fieldLink.Required !== (args.options.required === 'true')) {
-                updateRequired = true;
-            }
-            if (!updateHidden && !updateRequired) {
                 if (this.verbose) {
-                    logger.logToStderr('Field link already up-to-date');
+                    logger.logToStderr(`Updating field link...`);
+                }
+                const requiredProperty = typeof args.options.required !== 'undefined' &&
+                    this.fieldLink.Required !== (args.options.required === 'true') ? `<SetProperty Id="122" ObjectPathId="121" Name="Required"><Parameter Type="Boolean">${args.options.required}</Parameter></SetProperty>` : '';
+                const hiddenProperty = typeof args.options.hidden !== 'undefined' &&
+                    this.fieldLink.Hidden !== (args.options.hidden === 'true') ? `<SetProperty Id="123" ObjectPathId="121" Name="Hidden"><Parameter Type="Boolean">${args.options.hidden}</Parameter></SetProperty>` : '';
+                requestOptions = {
+                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': this.requestDigest
+                    },
+                    data: `<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>${requiredProperty}${hiddenProperty}<Method Name="Update" Id="124" ObjectPathId="19"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="121" Name="716a7b9e-3012-0000-22fb-84acfcc67d04|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${formatting_1.formatting.escapeXml(args.options.contentTypeId)}:fl:${this.fieldLink.Id}" /><Identity Id="19" Name="716a7b9e-3012-0000-22fb-84acfcc67d04|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${formatting_1.formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
                 }
-                return Promise.reject('DONE');
-            }
-            if (this.siteId) {
-                return Promise.resolve(undefined);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving site collection id...`);
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/site?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (res) {
-                this.siteId = res.Id;
-            }
-            if (this.webId) {
-                return Promise.resolve(undefined);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving site id...`);
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (res) {
-                this.webId = res.Id;
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Updating field link...`);
-            }
-            const requiredProperty = typeof args.options.required !== 'undefined' &&
-                this.fieldLink.Required !== (args.options.required === 'true') ? `<SetProperty Id="122" ObjectPathId="121" Name="Required"><Parameter Type="Boolean">${args.options.required}</Parameter></SetProperty>` : '';
-            const hiddenProperty = typeof args.options.hidden !== 'undefined' &&
-                this.fieldLink.Hidden !== (args.options.hidden === 'true') ? `<SetProperty Id="123" ObjectPathId="121" Name="Hidden"><Parameter Type="Boolean">${args.options.hidden}</Parameter></SetProperty>` : '';
-            const requestOptions = {
-                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': this.requestDigest
-                },
-                data: `<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>${requiredProperty}${hiddenProperty}<Method Name="Update" Id="124" ObjectPathId="19"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="121" Name="716a7b9e-3012-0000-22fb-84acfcc67d04|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${utils_1.formatting.escapeXml(args.options.contentTypeId)}:fl:${this.fieldLink.Id}" /><Identity Id="19" Name="716a7b9e-3012-0000-22fb-84acfcc67d04|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${utils_1.formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-            }
-            else {
-                cb();
-            }
-        }, (error) => {
-            if (error === 'DONE') {
-                cb();
             }
-            else {
-                this.handleRejectedODataJsonPromise(error, logger, cb);
+            catch (err) {
+                if (err !== 'DONE') {
+                    this.handleRejectedODataJsonPromise(err);
+                }
             }
         });
     }
@@ -248,7 +224,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': this.requestDigest
                     },
-                    data: `<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="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><Method Name="Update" Id="7" ObjectPathId="1"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="2" Name="d6667b9e-50fb-0000-2693-032ae7a0df25|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:field:${args.options.fieldId}" /><Method Id="4" ParentId="3" Name="Add"><Parameters><Parameter TypeId="{63fb2c92-8f65-4bbb-a658-b6cd294403f4}"><Property Name="Field" ObjectPathId="2" /></Parameter></Parameters></Method><Identity Id="1" Name="d6667b9e-80f4-0000-2693-05528ff416bf|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${utils_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></ObjectPaths></Request>`
+                    data: `<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="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><Method Name="Update" Id="7" ObjectPathId="1"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="2" Name="d6667b9e-50fb-0000-2693-032ae7a0df25|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:field:${args.options.id}" /><Method Id="4" ParentId="3" Name="Add"><Parameters><Parameter TypeId="{63fb2c92-8f65-4bbb-a658-b6cd294403f4}"><Property Name="Field" ObjectPathId="2" /></Parameter></Parameters></Method><Identity Id="1" Name="d6667b9e-80f4-0000-2693-05528ff416bf|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${formatting_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -270,7 +246,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
         return new Promise((resolve, reject) => {
             if (!requiresUpdate) {
                 if (this.verbose) {
-                    logger.logToStderr(`Schema of field ${args.options.fieldId} is already up-to-date`);
+                    logger.logToStderr(`Schema of field ${args.options.id} is already up-to-date`);
                 }
                 resolve();
                 return;
@@ -282,7 +258,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Updating field schema...`);
                 }
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/fields('${args.options.fieldId}')`,
+                    url: `${args.options.webUrl}/_api/web/fields('${args.options.id}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata',
                         'content-type': 'application/json;odata=nometadata',
@@ -315,7 +291,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
             if (this.debug) {
                 logger.logToStderr('Retrieving request digest...');
             }
-            utils_1.spo
+            spo_1.spo
                 .getRequestDigest(siteUrl)
                 .then((res) => {
                 this.requestDigest = res.FormDigestValue;
@@ -339,7 +315,7 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
     }, {
         option: '-c, --contentTypeId <contentTypeId>'
     }, {
-        option: '-f, --fieldId <fieldId>'
+        option: '-f, --id <id>'
     }, {
         option: '-r, --required [required]'
     }, {
@@ -347,8 +323,8 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
     });
 }, _SpoContentTypeFieldSetCommand_initValidators = function _SpoContentTypeFieldSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.fieldId)) {
-            return `${args.options.fieldId} is not a valid GUID`;
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         if (typeof args.options.required !== 'undefined') {
             if (args.options.required !== 'true' &&
@@ -362,7 +338,7 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
                 return `${args.options.hidden} is not a valid boolean value. Allowed values are true|false`;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoContentTypeFieldSetCommand_initTypes = function _SpoContentTypeFieldSetCommand_initTypes() {
     this.types.string.push('contentTypeId', 'c');

package/dist/m365/spo/commands/contenttype/contenttype-get.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 _SpoContentTypeGetCommand_instances, _SpoContentTypeGetCommand_initTelemetry, _SpoContentTypeGetCommand_initOptions, _SpoContentTypeGetCommand_initValidators, _SpoContentTypeGetCommand_initTypes;
+var _SpoContentTypeGetCommand_instances, _SpoContentTypeGetCommand_initTelemetry, _SpoContentTypeGetCommand_initOptions, _SpoContentTypeGetCommand_initValidators, _SpoContentTypeGetCommand_initTypes, _SpoContentTypeGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 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 SpoContentTypeGetCommand extends SpoCommand_1.default {
@@ -28,6 +29,7 @@ class SpoContentTypeGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CONTENTTYPE_GET;
@@ -35,49 +37,64 @@ class SpoContentTypeGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Retrieves information about the specified list or site content type';
     }
-    commandAction(logger, args, cb) {
-        let requestUrl = `${args.options.webUrl}/_api/web/${(args.options.listTitle ? `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/` : '')}contenttypes`;
-        if (args.options.id) {
-            requestUrl += `('${encodeURIComponent(args.options.id)}')`;
-        }
-        else if (args.options.name) {
-            requestUrl += `?$filter=Name eq '${encodeURIComponent(args.options.name)}'`;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            let errorMessage = '';
-            if (args.options.name) {
-                if (res.value.length === 0) {
-                    errorMessage = `Content type with name ${args.options.name} not found`;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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)}')`;
+            }
+            requestUrl += "/contenttypes";
+            if (args.options.id) {
+                requestUrl += `('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+            }
+            else if (args.options.name) {
+                requestUrl += `?$filter=Name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                let res = yield request_1.default.get(requestOptions);
+                let errorMessage = '';
+                if (args.options.name) {
+                    if (res.value.length === 0) {
+                        errorMessage = `Content type with name ${args.options.name} not found`;
+                    }
+                    else {
+                        res = res.value[0];
+                    }
                 }
-                else {
-                    res = res.value[0];
+                if (args.options.id && res['odata.null'] === true) {
+                    errorMessage = `Content type with ID ${args.options.id} not found`;
                 }
+                if (errorMessage) {
+                    throw errorMessage;
+                }
+                logger.log(res);
             }
-            if (args.options.id && res['odata.null'] === true) {
-                errorMessage = `Content type with ID ${args.options.id} not found`;
-            }
-            if (errorMessage) {
-                cb(new Command_1.CommandError(errorMessage));
-                return;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoContentTypeGetCommand_instances = new WeakSet(), _SpoContentTypeGetCommand_initTelemetry = function _SpoContentTypeGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined'
         });
@@ -87,6 +104,10 @@ _SpoContentTypeGetCommand_instances = new WeakSet(), _SpoContentTypeGetCommand_i
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-l, --listTitle [listTitle]'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id [id]'
     }, {
@@ -94,20 +115,19 @@ _SpoContentTypeGetCommand_instances = new WeakSet(), _SpoContentTypeGetCommand_i
     });
 }, _SpoContentTypeGetCommand_initValidators = function _SpoContentTypeGetCommand_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 && args.options.name) {
-            return 'Specify id or name, but not both';
-        }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify id or name, one is required';
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoContentTypeGetCommand_initTypes = function _SpoContentTypeGetCommand_initTypes() {
     this.types.string.push('id', 'i');
+}, _SpoContentTypeGetCommand_initOptionSets = function _SpoContentTypeGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoContentTypeGetCommand();
 //# sourceMappingURL=contenttype-get.js.map

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

@@ -15,8 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoContentTypeListCommand_instances, _SpoContentTypeListCommand_initTelemetry, _SpoContentTypeListCommand_initOptions, _SpoContentTypeListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoContentTypeListCommand extends SpoCommand_1.default {
@@ -36,24 +37,20 @@ class SpoContentTypeListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['StringId', 'Name', 'Hidden', 'ReadOnly', 'Sealed'];
     }
-    commandAction(logger, args, cb) {
-        let requestUrl = `${args.options.webUrl}/_api/web/ContentTypes`;
-        if (args.options.category) {
-            requestUrl += `?$filter=Group eq '${encodeURIComponent(args.options.category)}'`;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            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* () {
+            try {
+                let requestUrl = `${args.options.webUrl}/_api/web/ContentTypes`;
+                if (args.options.category) {
+                    requestUrl += `?$filter=Group eq '${formatting_1.formatting.encodeQueryParameter(args.options.category)}'`;
+                }
+                const res = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoContentTypeListCommand_instances = new WeakSet(), _SpoContentTypeListCommand_initTelemetry = function _SpoContentTypeListCommand_initTelemetry() {
@@ -69,7 +66,7 @@ _SpoContentTypeListCommand_instances = new WeakSet(), _SpoContentTypeListCommand
         option: '-c, --category [category]'
     });
 }, _SpoContentTypeListCommand_initValidators = function _SpoContentTypeListCommand_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 SpoContentTypeListCommand();
 //# sourceMappingURL=contenttype-list.js.map